From e5c09a85846bb06dc653f48f3b5421bbe5ad4836 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 11 Mar 2024 17:33:04 +0800
Subject: [PATCH] =?UTF-8?q?oa=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/out/index.js                          |  7 +--
 src/settings.js                               |  2 +-
 .../contract/components/contractSign.vue      | 13 ++---
 .../contract/components/printRegistration.vue |  4 +-
 src/views/contract/contractList.vue           | 50 ++++++-------------
 src/views/dashboard/index.vue                 |  7 +++
 .../system/workerComponents/department.vue    | 10 +++-
 7 files changed, 44 insertions(+), 49 deletions(-)

diff --git a/src/api/out/index.js b/src/api/out/index.js
index 4702dae..eecfe4c 100644
--- a/src/api/out/index.js
+++ b/src/api/out/index.js
@@ -22,10 +22,7 @@ export function httpCurl(params,noloading = true,s= '/Api/flowDetail',method='GE
     data: {
       url: url || process.env.VUE_APP_OUT_OLD,
       method,
-      params: {
-        s,
-        ...params
-      }
+      params
     },
     noloading
   })
@@ -52,4 +49,4 @@ export function getOaToken () {
     url: "/api/admin/oa/get-oa-token",
     noloading: true
   })
-}
\ No newline at end of file
+}
diff --git a/src/settings.js b/src/settings.js
index 9c61878..fd32f33 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -1,6 +1,6 @@
 module.exports = {
 
-  title: '江苏省苏州环境监测中心内控管理平台',
+  title: '江苏省宿迁环境监测中心内控管理平台',
 
   /**
    * @type {boolean} true | false
diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue
index 66ec3bf..f5e2b5c 100644
--- a/src/views/contract/components/contractSign.vue
+++ b/src/views/contract/components/contractSign.vue
@@ -536,13 +536,14 @@
       },
 
       async getOutContract() {
-        const res = await httpCurl({ tbname: 'hetong', out_contract_id: this.contract.id })
+        let url = `${process.env.VUE_APP_OUT_URL}/flow/view/${this.form.join_last_flow_id}`
+        const res = await httpCurl({ auth_token: this.$store.getters.oa_token ,get_raw:1 },true,"/Api/flowDetail", "GET",url)
         console.log(res)
-        if (res.flow.serial)  this.form.number = "HT-"+res.flow?.serial
-        if (res.flow_detail.total) this.form.money = Number(res.flow_detail?.total)
-        if (res.flow_detail.yifang) this.form.supply = res.flow_detail?.yifang
-        if (res.flow.dept_name) this.form.carryDepartment = res.flow?.dept_name
-        if (res.flow_detail.contract_content) this.form.content = res.flow_detail.contract_content
+        if (res.flow["合同编号"])  this.form.number = "HT-"+res.flow["合同编号"]
+        if (res.flow["合同金额"]) this.form.money = Number(res.flow["合同金额"])
+        if (res.flow["合同乙方"]) this.form.supply = res.flow["合同乙方"]
+        //if (res.flow.dept_name) this.form.carryDepartment = res.flow?.dept_name
+        if (res.flow["合同主要内容"]) this.form.content = res.flow["合同主要内容"]
       },
       //获取oa合同信息
       // async getOaContractInfo() {
diff --git a/src/views/contract/components/printRegistration.vue b/src/views/contract/components/printRegistration.vue
index 0c06836..0893d29 100644
--- a/src/views/contract/components/printRegistration.vue
+++ b/src/views/contract/components/printRegistration.vue
@@ -3,7 +3,7 @@
     <xy-dialog title="打印预览" :is-show.sync="isShow" :width="70" @on-ok="print" ok-text="打印">
       <template>
         <div class="print-table1" id="printtable1" ref="printtable">
-          <div class="print-table1-title">苏州市河道管理处资金划拨审批单</div>
+          <div class="print-table1-title">资金划拨审批单</div>
 
           <div class="print-table1-grid">
             <div style="grid-area: tb1-1" class="print-table1-grid-top">项目名称：<span
@@ -178,7 +178,7 @@
         printJS({
           printable: canvas.toDataURL(),
           type: 'image',
-          documentTitle: '苏州市河道管理处资金划拨审批单',
+          documentTitle: '资金划拨审批单',
           style: '@page{margin:auto;}'
         })
       }
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index 521cc80..5cb4655 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -2183,40 +2183,22 @@ export default {
       })
     },
     async toOaDetail (tbname,row) {
-      let res;
+      let url = `${process.env.VUE_APP_OUT_URL}/flow/view/`
       switch (tbname) {
-        case 'hetong':
-          res = await httpCurl({
-            tbname,
-            out_contract_id: row.id
-          })
+        case "caigou":
+          url += row.purchase_last_flow_id
           break;
-        case 'caigou':
-          res = await httpCurl({
-            tbname,
-            out_caigou_id: row.id
-          })
+        case "hetong":
+          url += row.join_last_flow_id
           break;
-        case 'pay':
-          res = await httpCurl({
-            tbname,
-            out_pay_id: row.id
-          })
-          break;
-      }
-      console.log(res)
-      if (res && res.flow?.id) {
-        window.open(
-          `${process.env.VUE_APP_OUT_OLD}/flow/view/${res.flow.id}&auth_token=${this.$store.getters.oa_token}`,
-          "bidding",
-          `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
-        )
-      } else {
-        this.$message({
-          type: 'warning',
-          message: '未查找到该流程'
-        })
+        default:
+          url = `${process.env.VUE_APP_OUT_URL}/admin/flow/list/todo`
       }
+      window.open(
+        url,
+        "detail",
+        `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
+      );
     },
     reset () {
       this.select = deepCopy(this.selectCopy)
@@ -2336,13 +2318,13 @@ export default {
       switch (row.flow_mod_id) {
         case 12:
           baseInfo = {
-            "6583b42c5c29a": row.name
+            "6583b42c5c29a": row.name,
           }
           break;
         case 5:
           baseInfo = {
             "65b37c797845d": row.name,
-            "65b37c8facfc9": row.content
+            "65b37c8facfc9": row.content,
           }
           break;
         case 29:
@@ -2353,12 +2335,12 @@ export default {
             "65852ba4697e7": row?.plans.reduce((pre,cur,index)=>(index === 0 ? cur?.name : pre+cur?.name+"，"),""),
             "65852bd7afd2f": row.plan_price,
             "65852bc914b8d": row.plan_price,
-            "65852c08d98f5": row.content
+            "65852c08d98f5": row.content,
           }
           break;
       }
       // let res = await getOatoken()
-      let url = `${process.env.VUE_APP_OUT_OLD}/flow/create/${row.flow_mod_id}?auth_token=${this.$store.getters.oa_token}&out_caigou_id=${
+      let url = `${process.env.VUE_APP_OUT_OLD}/flow/create/${row.flow_mod_id}?auth_token=${this.$store.getters.oa_token}&out_contract_id=${
         row.id
       }&default_json=${JSON.stringify(baseInfo)}`;
       console.log('url',url)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 02179f3..7c44975 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -944,6 +944,13 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+::v-deep .el-progress--line {
+  display: flex;
+  align-items: center;
+}
+::v-deep .el-progress__text {
+  word-break: keep-all;
+}
 .show-static-btn {
   cursor: pointer;
   font-size: 15px;
diff --git a/src/views/system/workerComponents/department.vue b/src/views/system/workerComponents/department.vue
index 9a7dfed..85d6b35 100644
--- a/src/views/system/workerComponents/department.vue
+++ b/src/views/system/workerComponents/department.vue
@@ -151,4 +151,12 @@ export default {
 };
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+::v-deep .el-progress--line {
+  display: flex;
+  align-items: center;
+}
+::v-deep .el-progress__text {
+  word-break: keep-all;
+}
+</style>