From 9b7f936b2798c55f2a314dd8671edfe7601ba894 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Thu, 2 Jan 2025 17:21:09 +0800
Subject: [PATCH] init

---
 .env.development                              |    8 +-
 src/api/system/department.js                  |    2 +-
 src/components/PlanPicker/index.vue           |    2 +-
 src/views/away/addAway.vue                    |    2 +-
 src/views/away/component/examineAway.vue      |    2 +-
 src/views/away/index.vue                      |   14 +-
 src/views/budget/budgetList.vue               |  172 +-
 src/views/budget/seeBudget.vue                |    2 +-
 src/views/budget/upload.vue                   |    2 +-
 .../contract/components/EditContract.vue      |   13 +-
 src/views/contract/contractEdit.vue           |   22 +-
 src/views/contract/contractLedger.vue         |   12 +-
 src/views/contract/contractList.vue           |   19 +-
 src/views/contract/contractProgress.vue       |    2 +-
 .../contract/paymentRegistrationList.vue      |    2 +-
 src/views/contract/seeContract.vue            | 3391 ++++++++++-------
 .../components/examineRegistration.vue        |    2 +-
 .../inOut/component/addExpenseAccount.vue     |   42 +-
 src/views/inOut/expenseAccount.vue            |    2 +-
 src/views/inOut/incomeRegistration.vue        |    2 +-
 .../statisticalReport/budgetProgress.vue      |    2 +-
 src/views/system/worker.vue                   |  242 --
 src/views/system/workerComponents/book.vue    |  146 -
 .../system/workerComponents/bookBorrow.vue    |  131 -
 .../system/workerComponents/department.vue    |  274 --
 .../system/workerComponents/quickMenu.vue     |  360 --
 .../system/workerComponents/signStatic.vue    |  309 --
 src/views/system/workerComponents/toDo.vue    |  274 --
 src/views/system/workerComponents/total.vue   |  186 -
 src/views/system/workerComponents/type.vue    |  305 --
 30 files changed, 2121 insertions(+), 3823 deletions(-)
 delete mode 100644 src/views/system/worker.vue
 delete mode 100644 src/views/system/workerComponents/book.vue
 delete mode 100644 src/views/system/workerComponents/bookBorrow.vue
 delete mode 100644 src/views/system/workerComponents/department.vue
 delete mode 100644 src/views/system/workerComponents/quickMenu.vue
 delete mode 100644 src/views/system/workerComponents/signStatic.vue
 delete mode 100644 src/views/system/workerComponents/toDo.vue
 delete mode 100644 src/views/system/workerComponents/total.vue
 delete mode 100644 src/views/system/workerComponents/type.vue

diff --git a/.env.development b/.env.development
index e0d38ab..6e322d7 100644
--- a/.env.development
+++ b/.env.development
@@ -2,10 +2,10 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API='https://cz-hjjc.115.langye.net'
-VUE_APP_UPLOAD_API='https://cz-hjjc.115.langye.net/api/upload-file'
+VUE_APP_BASE_API='https://cz-hjjc-test.115.langye.net'
+VUE_APP_UPLOAD_API='https://cz-hjjc-test.115.langye.net/api/upload-file'
 VUE_APP_PREVIEW=//view.langye.net/preview/onlinePreview
-VUE_APP_OUT_OLD=https://cz-hjjc.115.langye.net/oa
-VUE_APP_OUT_URL=https://cz-hjjc.115.langye.net/oa
+VUE_APP_OUT_OLD=https://cz-hjjc-test.115.langye.net/oa
+VUE_APP_OUT_URL=https://cz-hjjc-test.115.langye.net/oa
 
 VUE_APP_MODULE_NAME=ht
diff --git a/src/api/system/department.js b/src/api/system/department.js
index 21078d7..6c037ca 100644
--- a/src/api/system/department.js
+++ b/src/api/system/department.js
@@ -15,7 +15,7 @@ export function listdept() {
   })
 }
 
-export function listdeptNoAuth(params = {show_tree:1}){
+export function listdeptNoAuth(params = {page: 1,page_size: 999,sort_name:'sortnumber',sort_type:'asc'}){
   return request({
     url:'/api/ht/other/admin-department-list',
     method:'get',
diff --git a/src/components/PlanPicker/index.vue b/src/components/PlanPicker/index.vue
index fbf5041..b01d0ce 100644
--- a/src/components/PlanPicker/index.vue
+++ b/src/components/PlanPicker/index.vue
@@ -215,7 +215,7 @@ export default {
 
     getDepartment() {
       listdeptNoAuth().then((res) => {
-        this.departments = res;
+        this.departments = res.data;
       });
     },
     async getPlanTypes() {
diff --git a/src/views/away/addAway.vue b/src/views/away/addAway.vue
index 8de27a3..89a4dac 100644
--- a/src/views/away/addAway.vue
+++ b/src/views/away/addAway.vue
@@ -397,7 +397,7 @@ export default {
     },
     getDepartment() {
       listdeptNoAuth().then((res) => {
-        this.departments = res;
+        this.departments = res.data;
       });
     },
     async getPlanTypes() {
diff --git a/src/views/away/component/examineAway.vue b/src/views/away/component/examineAway.vue
index aa42717..6dedbc6 100644
--- a/src/views/away/component/examineAway.vue
+++ b/src/views/away/component/examineAway.vue
@@ -535,7 +535,7 @@ export default {
     //获取科室
     getDepartment() {
       listdeptNoAuth().then((res) => {
-        this.departments = res;
+        this.departments = res.data;
       });
     },
 
diff --git a/src/views/away/index.vue b/src/views/away/index.vue
index 1afcd5f..a8a2dea 100644
--- a/src/views/away/index.vue
+++ b/src/views/away/index.vue
@@ -48,6 +48,16 @@
               </span>
             </div>
 
+            <div>
+              <span>数据类型</span>
+              <span>
+                 <Select v-model="select.auth_type" style="width:70px">
+                   <Option :value="1">自己</Option>
+                   <Option :value="2">部门</Option>
+                 </Select>
+              </span>
+            </div>
+
             <div>
               <Button
                 type="primary"
@@ -82,9 +92,8 @@
           >
             <template #default="{ row }" v-if="!/Finance/g.test($route.path)">
               <Button v-if="row.flow_list.find(i => i.tag === 'chuchai')" style="margin: 2px;" size="small" type="primary" @click="printFlow(row)">打印流程</Button>
-              <template v-if="row.away_status === 1 && row.expense_status === 1">
+              <template v-if="row.flow_list.length === 0">
                 <Poptip
-                  v-if="isAuthEdit(row)"
                   :transfer="true"
                   confirm
                   placement="bottom"
@@ -244,6 +253,7 @@ export default {
         keyword: '',
         start_year: "",
         end_year: "",
+        auth_type: 1,
         page: 1,
         page_size: 10
       },
diff --git a/src/views/budget/budgetList.vue b/src/views/budget/budgetList.vue
index e64d0c1..c2dd6c7 100644
--- a/src/views/budget/budgetList.vue
+++ b/src/views/budget/budgetList.vue
@@ -110,18 +110,6 @@
           :align="item.align"
           :formatter="item.formatter"
         >
-<!--          <template slot-scope="scope">-->
-<!--            <span v-if="item.formatter">-->
-<!--              {{ item.formatter(scope.row, scope.row, scope.row[item.prop]) }}-->
-<!--            </span>-->
-<!--            <span v-else>-->
-<!--              {{-->
-<!--                item.prop.indexOf(".") > -1-->
-<!--                  ? scope.row[item.prop.split(".")[0]][item.prop.split(".")[1]]-->
-<!--                  : scope.row[item.prop]-->
-<!--              }}-->
-<!--            </span>-->
-<!--          </template>-->
         </el-table-column>
         <el-table-column
           fixed="right"
@@ -320,18 +308,6 @@
               style="width: 300px"
               @change="(e) => (form.type = e[e.length - 1] || '')"
             />
-<!--            <el-select-->
-<!--              v-model="form.type"-->
-<!--              clearable-->
-<!--              placeholder="请选择预算类型"-->
-<!--              style="width: 300px"-->
-<!--            >-->
-<!--              <el-option-->
-<!--                v-for="item in types"-->
-<!--                :label="item.value"-->
-<!--                :value="item.id"-->
-<!--              ></el-option>-->
-<!--            </el-select>-->
           </div>
         </div>
       </template>
@@ -379,6 +355,30 @@
           </div>
         </div>
       </template>
+      <template #dimension>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            资金隶属维度
+          </div>
+          <div class="xy-table-item-content">
+            <el-select
+              placeholder="隶属维度选择"
+              clearable
+              size="small"
+              v-model="form.dimension"
+              style="width: 300px"
+            >
+              <el-option
+                v-for="item in dimensions"
+                :label="item.remark"
+                :value="item.value"
+                :key="item.id"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
       <template v-slot:department>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -487,6 +487,26 @@
           </div>
         </div>
       </template>
+      <template #middle_special>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            是否年中专项资金
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.middle_special" :active-value="1" :inactive-value="0" active-text="是" inactive-text="否"></el-switch>
+          </div>
+        </div>
+      </template>
+      <template #is_chart>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            是否参与执行率统计
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.is_chart" :active-value="1" :inactive-value="0" active-text="是" inactive-text="否"></el-switch>
+          </div>
+        </div>
+      </template>
       <template v-slot:remark>
         <div class="xy-table-item">
           <div class="xy-table-item-label">备注</div>
@@ -550,18 +570,6 @@
               style="width: 300px"
               @change="(e) => (editorForm.type = e[e.length - 1] || '')"
             />
-<!--            <el-select-->
-<!--              v-model="editorForm.type"-->
-<!--              clearable-->
-<!--              placeholder="请选择预算类型"-->
-<!--              style="width: 300px"-->
-<!--            >-->
-<!--              <el-option-->
-<!--                v-for="item in types"-->
-<!--                :label="item.value"-->
-<!--                :value="item.id"-->
-<!--              ></el-option>-->
-<!--            </el-select>-->
           </div>
         </div>
       </template>
@@ -609,6 +617,30 @@
           </div>
         </div>
       </template>
+      <template #dimension>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            资金隶属维度
+          </div>
+          <div class="xy-table-item-content">
+            <el-select
+              placeholder="隶属维度选择"
+              clearable
+              size="small"
+              v-model="editorForm.dimension"
+              style="width: 300px"
+            >
+              <el-option
+                v-for="item in dimensions"
+                :label="item.remark"
+                :value="item.value"
+                :key="item.id"
+              >
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
       <template v-slot:department>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -632,15 +664,6 @@
               >
               </el-option>
             </el-select>
-<!--            <el-cascader-->
-<!--              :options="departments"-->
-<!--              :props="{ checkStrictly: true, label: 'name', value: 'id' }"-->
-<!--              :value="editorForm.department"-->
-<!--              clearable-->
-<!--              size="small"-->
-<!--              style="width: 300px"-->
-<!--              @change="(e) => (editorForm.department = e[e.length - 1] || '')"-->
-<!--            />-->
           </div>
         </div>
       </template>
@@ -748,6 +771,26 @@
           </div>
         </div>
       </template>
+      <template #middle_special>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            是否年中专项资金
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="editorForm.middle_special" :active-value="1" :inactive-value="0" active-text="是" inactive-text="否"></el-switch>
+          </div>
+        </div>
+      </template>
+      <template #is_chart>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            是否参与执行率统计
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="editorForm.is_chart" :active-value="1" :inactive-value="0" active-text="是" inactive-text="否"></el-switch>
+          </div>
+        </div>
+      </template>
       <template v-slot:remark>
         <div class="xy-table-item">
           <div class="xy-table-item-label">备注</div>
@@ -845,10 +888,13 @@ export default {
         name: "",
         type: "",
         flow_mod_id: "",
+        dimension: '',
         year: "",
         department: "",
         money: "",
         content: "",
+        middle_special: 0,
+        is_chart: 1,
         remark: "",
         plan_department_link_id: [],
         plan_department_links: [],
@@ -979,6 +1025,7 @@ export default {
       },
       departments: [], //部门类型
       users: [],
+      dimensions: [],
 
       //编辑信息
       isShowEditor: false,
@@ -1122,8 +1169,8 @@ export default {
     },
     //获取科室
     getDepartment() {
-      listCommondepartment({show_tree:1}).then((res) => {
-        this.departments = res;
+      listCommondepartment({ page: 1,page_size: 999,sort_name: 'sortnumber',sort_type: 'asc' }).then((res) => {
+        this.departments = res.data;
       });
     },
     async getUsers () {
@@ -1133,6 +1180,17 @@ export default {
       })
       this.users = res.data;
     },
+    //获取资金隶属维度
+    async getDimensions() {
+      try {
+        const res = await getparameter({
+          number: "dimensions"
+        })
+        this.dimensions = res.detail
+      } catch (err) {
+        console.error(err)
+      }
+    },
     //事前流程
     async getFlowIds () {
       let copy = deepCopy(this.flowIds)
@@ -1209,7 +1267,10 @@ export default {
         plan_admin_links: this.form.plan_admin_links,
         remark: this.form.remark,
         pid: this.form.pid,
-        flow_mod_id: this.form.flow_mod_id
+        flow_mod_id: this.form.flow_mod_id,
+        dimension: this.form.dimension,
+        middle_special: this.form.middle_special,
+        is_chart: this.form.is_chart
       }).then((res) => {
         Message({
           message: "操作成功",
@@ -1264,7 +1325,10 @@ export default {
             plan_department_links: plan_department_links,
             plan_admin_links: this.editorForm.plan_admin_links,
             pid: this.editorForm.pid,
-            flow_mod_id: this.editorForm.flow_mod_id
+            flow_mod_id: this.editorForm.flow_mod_id,
+            dimension: this.editorForm.dimension,
+            middle_special: this.editorForm.middle_special,
+            is_chart: this.editorForm.is_chart
           }).then((res) => {
             this.isShowEditor = false;
             Message({
@@ -1291,6 +1355,7 @@ export default {
           name: res.name,
           type: res.type,
           flow_mod_id: res.flow_mod_id,
+          dimension: res.dimension,
           department: res.plan_department_id,
           money: moneyFormatter(res.money),
           update_money: moneyFormatter(res.update_money),
@@ -1300,6 +1365,8 @@ export default {
           plan_department_links: res.plan_department_links,
           plan_admin_links: res.plan_admin_links.map(i=> ({admin_id: i.admin_id})),
           pid: res.pid,
+          is_chart: res.is_chart,
+          middle_special: res.middle_special
         };
         let ids = [];
         res.plan_department_links.map((item) => {
@@ -1314,6 +1381,10 @@ export default {
     },
   },
   created() {
+    this.getUsers();
+    this.getTypes();
+    this.getDepartment();
+    this.getDimensions();
     this.getFlowIds();
     this.table = this.tableItem;
     this.initLoad();
@@ -1321,10 +1392,7 @@ export default {
     this.select.year = this.$moment().format("YYYY");
   },
   mounted() {
-    this.getTypes();
-    this.getDepartment();
     this.getBudgets();
-    this.getUsers();
   },
 };
 </script>
diff --git a/src/views/budget/seeBudget.vue b/src/views/budget/seeBudget.vue
index 849b780..24111a1 100644
--- a/src/views/budget/seeBudget.vue
+++ b/src/views/budget/seeBudget.vue
@@ -274,7 +274,7 @@
       //获取科室
       getDepartment() {
         listdeptNoAuth().then(res => {
-          this.departments = res
+          this.departments = res.data
         })
       },
       //查询计划列表
diff --git a/src/views/budget/upload.vue b/src/views/budget/upload.vue
index a0a997b..0b296ab 100644
--- a/src/views/budget/upload.vue
+++ b/src/views/budget/upload.vue
@@ -142,7 +142,7 @@ export default {
   },
   methods: {
     async getDept() {
-      const res = await listdeptNoAuth({ page: 1, page_size: 999 });
+      const res = await listdeptNoAuth({ page: 1, page_size: 999,sort_name:'sortnumber',sort_type: 'asc' });
       this.depts = res.data;
     },
     async getList() {
diff --git a/src/views/contract/components/EditContract.vue b/src/views/contract/components/EditContract.vue
index ffd4784..212b9cd 100644
--- a/src/views/contract/components/EditContract.vue
+++ b/src/views/contract/components/EditContract.vue
@@ -28,7 +28,7 @@
               <span style="flex: 1; text-align: right">（无需采购流程，如水电邮寄费等）</span>
             </el-form-item>
 
-            <el-form-item prop="flow_mod_id" label="事前流程">
+            <el-form-item prop="flow_mod_id" label="事前流程" v-if="!form.is_simple">
               <template v-if="!form.is_common_purchase">
                 <el-select v-model="form.flow_mod_id" style="width: 100%">
                   <el-option v-for="item in flowIdsFormat" :key="item.id" :value="item.id" :label="item.name"></el-option>
@@ -69,7 +69,6 @@
                 multiple
                 size="small"
                 clearable
-                disabled
                 placeholder="请选择资金渠道"
                 :value="
                   form.money_way_id
@@ -770,7 +769,7 @@ export default {
         type: [
           {
             validator: (rule, value, callback) => {
-              if (!this.form.is_simple || !this.isNeedMore) {
+              if (!this.form.is_simple || !this.isNeedMore || !this.form.is_common_purchase) {
                 if (!this.hasValue(value)) {
                   callback(new Error("必填"));
                 } else {
@@ -786,7 +785,7 @@ export default {
         purchase_type_id: [
           {
             validator: (rule, value, callback) => {
-              if (!this.form.is_simple || !this.isNeedMore) {
+              if (!this.form.is_simple || !this.isNeedMore || !this.form.is_common_purchase) {
                 if (!this.hasValue(value)) {
                   callback(new Error("必填"));
                 } else {
@@ -802,7 +801,7 @@ export default {
         purchase_way_id: [
           {
             validator: (rule, value, callback) => {
-              if (!this.form.is_simple || !this.isNeedMore) {
+              if (!this.form.is_simple || !this.isNeedMore || !this.form.is_common_purchase) {
                 if (!this.hasValue(value)) {
                   callback(new Error("必填"));
                 } else {
@@ -838,7 +837,7 @@ export default {
         plan_money: [
           {
             validator: (rule, value, callback) => {
-              if (!this.form.is_simple) {
+              if (!this.form.is_simple || !this.form.is_common_purchase) {
                 if (!this.hasValue(value)) {
                   callback(new Error("必填"));
                 } else {
@@ -858,7 +857,7 @@ export default {
         money_way_id: [
           {
             validator: (rule, value, callback) => {
-              if (!this.hasValue(value)) {
+              if (!this.hasValue(value) || !this.form.is_common_purchase) {
                 callback(new Error("必填"));
               } else {
                 callback();
diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue
index 70021ab..e8d0e99 100644
--- a/src/views/contract/contractEdit.vue
+++ b/src/views/contract/contractEdit.vue
@@ -209,7 +209,7 @@
                 />
               </el-form-item>
 
-              <el-form-item prop="flow_mod_id" label="事前流程">
+              <el-form-item prop="flow_mod_id" label="事前流程" v-if="!form.is_simple">
                 <el-select v-model="form.flow_mod_id" style="width: 100%">
                   <el-option v-for="item in flowIdsFormat" :key="item.id" :value="item.id" :label="item.name"></el-option>
                 </el-select>
@@ -1433,7 +1433,7 @@ export default {
 
     getDepartment() {
       listdeptNoAuth().then((res) => {
-        this.departments = res;
+        this.departments = res.data;
       });
     },
     async getPlanTypes() {
@@ -1538,24 +1538,6 @@ export default {
                     keyword: this.form.name,
                   },
                 })
-                getContract({
-                  page: 1,
-                  page_size: 1,
-                  sort_name: "created_at"
-                },true).then(res => {
-                  const openData = res.list.data[0]
-                  if (openData) {
-                    if (
-                      openData.is_simple !== 1 &&
-                      openData.purchase_status === 1 &&
-                      ((openData.req_status === 3 && openData.is_plan === 0) ||
-                        openData.is_plan === 1) &&
-                      !openData.is_substitute
-                    ) {
-                      this.buyProcess(openData)
-                    }
-                  }
-                })
               }).catch(_ => this.btnLoading = false)
             }
             if (this.type === 'edit') {
diff --git a/src/views/contract/contractLedger.vue b/src/views/contract/contractLedger.vue
index d890053..8565769 100644
--- a/src/views/contract/contractLedger.vue
+++ b/src/views/contract/contractLedger.vue
@@ -327,15 +327,7 @@
                 <Button ghost size="small" type="primary">更多</Button>
                 <div slot="content">
                   <template
-                    v-if="
-                      !(
-                        scope.row.req_status != 1 ||
-                        scope.row.join_status != 1 ||
-                        scope.row.invite_status != 1 ||
-                        scope.row.purchase_status != 1 ||
-                        scope.row.status === 2
-                      )
-                    "
+                    v-if="scope.row.flow_list.length === 0"
                   >
                     <Poptip
                       :transfer="true"
@@ -2088,7 +2080,7 @@ export default {
     },
     //获取科室
     async getDepartment() {
-      this.departments = await listdeptNoAuth();
+      this.departments = (await listdeptNoAuth())?.data;
     },
     //获取购买形式列表
     async getPurchaseType() {
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index b3a3b23..c9d92b0 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -376,15 +376,7 @@
                 <Button ghost size="small" type="primary">更多</Button>
                 <div slot="content">
                   <template
-                    v-if="
-                      !(
-                        scope.row.req_status != 1 ||
-                        scope.row.join_status != 1 ||
-                        scope.row.invite_status != 1 ||
-                        scope.row.purchase_status != 1 ||
-                        scope.row.status === 2
-                      )
-                    "
+                    v-if="scope.row.flow_list.length === 0"
                   >
                     <Poptip
                       :transfer="true"
@@ -1795,7 +1787,7 @@ export default {
     },
     //获取科室
     async getDepartment() {
-      this.departments = await listdeptNoAuth();
+      this.departments = (await listdeptNoAuth())?.data;
     },
     //组织形式
     async getGroupType() {
@@ -2108,7 +2100,7 @@ export default {
         if (item.is_contract) {
           //为合同 不为网上商城
           flowStatus["shenpi"].setStatus(shenpi?.flow_status ?? 2)
-          if ((!shenpi?.flow_status || shenpi?.flow_status === 2) && ((item.is_tender_audit && item.invite_status === 1) || (!item.is_tender_audit && (caigou?.flow_status === 1 || common_purchase?.flow_status === 1)))) {
+          if ((!shenpi?.flow_status || shenpi?.flow_status === 2) && ((item.is_tender_audit && item.invite_status === 1) && (caigou?.flow_status === 1 || common_purchase?.flow_status === 1))) {
             //审批未开始 走招标招标完成或不走招标采购完成
             flowStatus["shenpi"].setExecutable(true)
           }
@@ -2120,7 +2112,7 @@ export default {
           }
         }
       } else {
-        if (item.flow_mod_id) {
+        if (item.flow_mod_id && item.is_simple !== 1) {
           //非采购事前流程
           flowStatus["other"].setStatus(other?.flow_status ?? 2)
           if (!other || other.flow_status === 2) {
@@ -2133,9 +2125,8 @@ export default {
         //最后一笔没付完
         if (
           (item.is_purchase === 0 && other?.flow_status === 1) ||
-          item.status === 2 ||
           (!item.is_contract && item.is_simple) ||
-          (item.is_tender_audit && !item.is_contract && item.invite_status === 1) ||
+          (item.is_tender_audit && !item.is_contract && item.invite_status === 1 && (caigou?.flow_status === 1 || common_purchase?.flow_status === 1)) ||
           (!item.is_tender_audit && !item.is_contract && (caigou?.flow_status === 1 || common_purchase?.flow_status === 1))
         ) {
           //网上商场的话采购完成 合同签订完成 不为合同并且为简易
diff --git a/src/views/contract/contractProgress.vue b/src/views/contract/contractProgress.vue
index 8b33129..ea74051 100644
--- a/src/views/contract/contractProgress.vue
+++ b/src/views/contract/contractProgress.vue
@@ -1222,7 +1222,7 @@ export default {
     },
     //获取科室
     async getDepartment() {
-      this.departments = await listdeptNoAuth();
+      this.departments = (await listdeptNoAuth()?.data);
     },
     //获取购买形式列表
     async getPurchaseType() {
diff --git a/src/views/contract/paymentRegistrationList.vue b/src/views/contract/paymentRegistrationList.vue
index fe64246..02f0e75 100644
--- a/src/views/contract/paymentRegistrationList.vue
+++ b/src/views/contract/paymentRegistrationList.vue
@@ -72,7 +72,7 @@
           header-align="center"
         >
           <template slot-scope="scope">
-            <template v-if="scope.row.status === 0 && type == 1 && scope.row.flow_status === 1">
+            <template v-if="scope.row.status === 0 && type == 1 && scope.row.flow_list.length === 0">
               <Poptip
                 placement="bottom"
                 confirm
diff --git a/src/views/contract/seeContract.vue b/src/views/contract/seeContract.vue
index 547efaa..089dcd8 100644
--- a/src/views/contract/seeContract.vue
+++ b/src/views/contract/seeContract.vue
@@ -1,333 +1,361 @@
 <template>
-  <div ref="contractList" style="padding: 0 20px;">
-    <lx-header icon="md-apps" style="margin-bottom: 10px; border: 0px; margin-top: 15px" :text="pageTitle">
+  <div ref="contractList" style="padding: 0 20px">
+    <lx-header
+      icon="md-apps"
+      style="margin-bottom: 10px; border: 0px; margin-top: 15px"
+      text="合同列表"
+    >
       <div slot="content"></div>
       <slot>
         <div class="selects">
           <div>
-            <span style="padding: 0 6px;word-break: keep-all;">关键字</span>
+            <span style="padding: 0 6px; word-break: keep-all">关键字</span>
             <span>
-              <Input v-model="select.keyword" clearable placeholder="关键字搜索" style="width: 200px" />
+              <Input
+                v-model="select.keyword"
+                clearable
+                placeholder="关键字搜索"
+                style="width: 200px"
+              />
             </span>
           </div>
           <xy-selectors style="margin-left: 10px;" @search="getContracts" @reset="reset">
             <div class="select-content">
               <div>
-                <span style="padding: 0 6px;word-break: keep-all;">服务商/供应商</span>
+            <span style="padding: 0 6px; word-break: keep-all"
+            >服务商/供应商</span
+            >
                 <span>
-              <Input v-model="select.supply" clearable placeholder="请输入服务商/供应商" style="width: 200px" />
+              <Input
+                v-model="select.supply"
+                clearable
+                placeholder="请输入服务商/供应商"
+                style="width: 200px"
+              />
             </span>
               </div>
-              <div v-if="type!=1">
-                <span style="padding: 0 6px;word-break: keep-all;">预算计划</span>
+
+              <div>
+                <span style="padding: 0 6px; word-break: keep-all">预算计划</span>
 
                 <span>
-              <Input v-model="select.plan_name" clearable placeholder="请选择预算计划" @on-focus="showPlanForSearch"
-                     style="width: 200px" @on-clear="clearSelectForSearch" />
-            </span>
-              </div>
-              <div v-if="type!=1">
-                <span style="padding: 0 6px;word-break: keep-all;">签订年份</span>
-                <span>
-              <DatePicker :value="select.year" placeholder="选择年份" placement="bottom" style="width: 90px;" type="year"
-                          @on-change="(e)=>select.year = e"></DatePicker>
+              <Input
+                v-model="select.plan_name"
+                clearable
+                placeholder="请选择预算计划"
+                @on-focus="showPlanForSearch"
+                style="width: 200px"
+                @on-clear="clearSelectForSearch"
+              />
             </span>
               </div>
-              <div v-if="type!=1">
-                <span style="padding: 0 6px;word-break: keep-all;">创建日期</span>
+              <div>
+                <span style="padding: 0 6px; word-break: keep-all">签订年份</span>
                 <span>
-              <DatePicker v-model="select.showDatePicker" clearable placeholder="请选择日期" placement="bottom-start"
-                          style="width: 200px" type="daterange" @on-change="datePick"></DatePicker>
+              <DatePicker
+                :value="select.year"
+                placeholder="选择年份"
+                placement="bottom"
+                style="width: 90px"
+                type="year"
+                @on-change="(e) => (select.year = e)"
+              ></DatePicker>
             </span>
               </div>
-              <div v-if="type==1">
-                <span style="padding: 0 6px;word-break: keep-all;">保函有效期</span>
+              <div>
+                <span style="padding: 0 6px; word-break: keep-all">创建日期</span>
                 <span>
-              <DatePicker v-model="select.showDatePickerBao" clearable placeholder="请选择日期" placement="bottom-start"
-                          style="width: 200px" type="daterange" @on-change="datePickBao"></DatePicker>
+              <DatePicker
+                v-model="select.showDatePicker"
+                clearable
+                placeholder="请选择日期"
+                placement="bottom-start"
+                style="width: 200px"
+                type="daterange"
+                @on-change="datePick"
+              ></DatePicker>
             </span>
               </div>
 
-
-              <div v-if="type==1">
-            <span style="padding: 0 6px;word-break: keep-all;">
-              保函金额
-            </span>
-                <InputNumber v-model="select.start_assurance_money" :min="0" placeholder="最小金额" style="width: 100px;" />
-                <span style="padding: 0 5px;">-</span>
-                <InputNumber v-model="select.end_assurance_money" :min="0" placeholder="最大金额" style="width: 100px;" />
-              </div>
-
               <div>
-            <span style="padding: 0 6px;word-break: keep-all;">
-              项目类型
-            </span>
-                <Select v-model="select.type" clearable placeholder="请选择项目类型" style="width:140px;">
-                  <Option v-for="item in types" :key="item.value" :value="item.value">{{ item.label }}</Option>
+                <span style="padding: 0 6px; word-break: keep-all"> 项目类型 </span>
+                <Select
+                  v-model="select.type"
+                  clearable
+                  placeholder="请选择项目类型"
+                  style="width: 140px"
+                >
+                  <Option
+                    v-for="item in type"
+                    :key="item.value"
+                    :value="item.value"
+                  >{{ item.label }}</Option
+                  >
                 </Select>
               </div>
 
               <div>
-            <span style="padding: 0 6px;word-break: keep-all;">
-              业务科室
-            </span>
-                <el-select v-model="select.department_id" clearable placeholder="业务科室选择" size="small" style="width: 120px;">
-                  <el-option v-for="item in departments" :key="item.id" :label="item.name" :value="item.id">
+                <span style="padding: 0 6px; word-break: keep-all"> 业务科室 </span>
+                <el-select
+                  v-model="select.department_id"
+                  clearable
+                  placeholder="业务科室选择"
+                  size="small"
+                  style="width: 120px"
+                >
+                  <el-option
+                    v-for="item in departments"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
                   </el-option>
                 </el-select>
               </div>
 
-              <div v-if="type!=1">
-            <span style="padding: 0 6px;word-break: keep-all;">
-              采购形式
-            </span>
-                <Select v-model="select.purchase_type_id" clearable placeholder="请选择采购形式" style="width:140px;">
-                  <Option v-for="item in purchaseType" :key="item.id" :value="item.id">{{ item.value }}</Option>
+              <div>
+                <span style="padding: 0 6px; word-break: keep-all"> 采购形式 </span>
+                <Select
+                  v-model="select.purchase_type_id"
+                  clearable
+                  placeholder="请选择采购形式"
+                  style="width: 140px"
+                >
+                  <Option
+                    v-for="item in purchaseType"
+                    :key="item.id"
+                    :value="item.id"
+                  >{{ item.value }}</Option
+                  >
                 </Select>
               </div>
 
-              <div v-if="type!=1">
-            <span style="padding: 0 6px;word-break: keep-all;">
-              采购方式
-            </span>
-                <Select v-model="select.purchase_way_id" clearable placeholder="请选择采购方式" style="width:200px;">
-                  <Option v-for="item in purchaseWay" :key="item.id" :value="item.id">{{ item.value }}</Option>
+              <div>
+                <span style="padding: 0 6px; word-break: keep-all"> 采购方式 </span>
+                <Select
+                  v-model="select.purchase_way_id"
+                  clearable
+                  placeholder="请选择采购方式"
+                  style="width: 200px"
+                >
+                  <Option
+                    v-for="item in purchaseWay"
+                    :key="item.id"
+                    :value="item.id"
+                  >{{ item.value }}</Option
+                  >
                 </Select>
               </div>
 
-              <div v-if="type!=1">
-            <span style="padding: 0 6px;word-break: keep-all;">
-              预算金额
-            </span>
-                <InputNumber v-model="select.start_plan_price" :min="0" placeholder="最小金额" style="width: 100px;" />
-                <span style="padding: 0 5px;">-</span>
-                <InputNumber v-model="select.end_plan_price" :min="0" placeholder="最大金额" style="width: 100px;" />
+              <div>
+                <span style="padding: 0 6px; word-break: keep-all"> 预算金额 </span>
+                <el-input-number
+                  size="small"
+                  :controls="false"
+                  v-model="select.start_plan_price"
+                  :min="0"
+                  placeholder="最小金额"
+                  style="width: 100px"
+                />
+                <span style="padding: 0 5px">-</span>
+                <el-input-number
+                  size="small"
+                  :controls="false"
+                  v-model="select.end_plan_price"
+                  :min="0"
+                  placeholder="最大金额"
+                  style="width: 100px"
+                />
               </div>
 
-              <div v-if="type!=1">
-            <span style="padding: 0 6px;word-break: keep-all;">
-              合同状态
-            </span>
-                <Select v-model="select.status" clearable placeholder="请选择" style="width:100px;">
-                  <Option v-for="item in [{label:'待签订',value:1},{label:'已签订',value:2}]" :key="item.value"
-                          :value="item.value">{{ item.label }}
+              <div>
+                <span style="padding: 0 6px; word-break: keep-all"> 合同状态 </span>
+                <Select
+                  v-model="select.status"
+                  clearable
+                  placeholder="请选择"
+                  style="width: 100px"
+                >
+                  <Option
+                    v-for="item in [
+                  { label: '待签订', value: 1 },
+                  { label: '已签订', value: 2 },
+                ]"
+                    :key="item.value"
+                    :value="item.value"
+                  >{{ item.label }}
                   </Option>
                 </Select>
               </div>
 
               <div>
-            <span style="padding: 0 6px;word-break: keep-all;">
-              履约保函状态
-            </span>
-                <Select v-model="select.assurance_status" clearable placeholder="请选择" style="width:100px;">
-                  <Option v-for="item in [{label:'未收取',value:0},{label:'已收取',value:1}]" :key="item.value"
-                          :value="item.value">{{ item.label }}
-                  </Option>
-                </Select>
-              </div>
-              <div v-if="type!=1">
-            <span style="padding: 0 6px;word-break: keep-all;">
+            <span style="padding: 0 6px; word-break: keep-all">
               招标流程状态
             </span>
 
-                <Select v-model="select.invite_status" clearable placeholder="请选择" style="width:100px;">
-                  <Option v-for="item in options" :key="item.value" :value="item.value">{{ item.label }}
+                <Select
+                  v-model="select.invite_status"
+                  clearable
+                  placeholder="请选择"
+                  style="width: 100px"
+                >
+                  <Option
+                    v-for="item in options"
+                    :key="item.value"
+                    :value="item.value"
+                  >{{ item.label }}
                   </Option>
                 </Select>
               </div>
-              <div v-if="type!=1">
-            <span style="padding: 0 6px;word-break: keep-all;">
+              <div>
+            <span style="padding: 0 6px; word-break: keep-all">
               采购流程状态
             </span>
 
-                <Select v-model="select.purchase_status" clearable placeholder="请选择" style="width:100px;">
-                  <Option v-for="item in options" :key="item.value" :value="item.value">{{ item.label }}
+                <Select
+                  v-model="select.purchase_status"
+                  clearable
+                  placeholder="请选择"
+                  style="width: 100px"
+                >
+                  <Option
+                    v-for="item in options"
+                    :key="item.value"
+                    :value="item.value"
+                  >{{ item.label }}
                   </Option>
                 </Select>
               </div>
-              <div v-if="type!=1">
-            <span style="padding: 0 6px;word-break: keep-all;">
-              合同会签状态
+              <div>
+            <span style="padding: 0 6px; word-break: keep-all">
+              合同审批状态
             </span>
 
-                <Select v-model="select.join_status" clearable placeholder="请选择" style="width:100px;">
-                  <Option v-for="item in options" :key="item.value" :value="item.value">{{ item.label }}
+                <Select
+                  v-model="select.join_status"
+                  clearable
+                  placeholder="请选择"
+                  style="width: 100px"
+                >
+                  <Option
+                    v-for="item in options"
+                    :key="item.value"
+                    :value="item.value"
+                  >{{ item.label }}
                   </Option>
                 </Select>
               </div>
-<!--              <div v-if="type!=1">-->
-<!--            <span style="padding: 0 6px;word-break: keep-all;">-->
-<!--              请示流程状态-->
-<!--            </span>-->
-<!--                <Select v-model="select.req_status" clearable placeholder="请选择" style="width:100px;">-->
-<!--                  <Option v-for="item in options" :key="item.value" :value="item.value">{{ item.label }}-->
-<!--                  </Option>-->
-<!--                </Select>-->
-<!--              </div>-->
             </div>
           </xy-selectors>
 
-
-          <Button style="margin-left: 10px" type="primary" @click="searchContracts">查询</Button>
-          <Button ghost style="margin-left: 10px" type="primary"
-            @click=" select = {showDatePicker:'',ageIndex:1,startDate:'',endDate:'',type:'',department:'',purchaseModality:'',purchaseMethods:'',priceMin:null,priceMax:null,status:''}">
-            重置
-          </Button>
+          <Button
+            style="margin-left: 10px"
+            type="primary"
+            @click="new RegExp(/contractLedger/g).test($route.path) ? ($refs['addContractLedger'].setType('add'),$refs['addContractLedger'].show()) : $router.push('/contract/contractEdit')"
+          >新增</Button
+          >
+          <Button style="margin-left: 10px" type="primary" @click="select.pageIndex=1,getContracts()"
+          >查询</Button
+          >
+          <Button type="primary" @click="toExport()" style="margin-left: 10px"
+          >导出</Button
+          >
           <!--          <Button type="primary"  style="margin-left: 10px">导出</Button>-->
         </div>
       </slot>
     </lx-header>
 
-    <xy-table ref="xyTable" :cell-style="cellStyle" :list="list" :show-summary="true" :summary-method="summary"
-      :table-item="type === 0 ? table : table1" @cellClick="showPaymentPlan" @delete="(row)=>deleteContract(row.id)"
-      @editor="">
+    <xy-table
+      ref="xyTable"
+      :list="list"
+      :show-summary="true"
+      :summary-method="summary"
+      :table-item="/contractLedger/g.test($route.path) ? ledgerTable : table"
+      @cellClick="showPaymentPlan"
+      @delete="(row) => deleteContract(row.id)"
+      @editor=""
+    >
       <template v-slot:btns>
-        <el-table-column fixed="right" header-align="center" label="操作" width="200">
+        <el-table-column
+          fixed="right"
+          header-align="center"
+          label="操作"
+          width="200"
+        >
           <template slot-scope="scope">
             <div class="slot-btns">
-              <Button class="slot-btns-item" size="small" type="primary"
-                @click="$refs['detailContract'].getDetail(scope.row.id),$refs['detailContract'].isShowDetail = true">
+              <Button
+                class="slot-btns-item"
+                size="small"
+                type="primary"
+                @click="
+                      $refs['detailContract'].getDetail(scope.row.id),
+                        ($refs['detailContract'].isShowDetail = true)
+                    "
+              >
                 查看
               </Button>
-              <Button class="slot-btns-item" @click="switchAssurance(scope.row.id,1)" size="small" type="primary"
-                v-if="scope.row.assurance_status==0&&type==1&&scope.row.is_assurance==1">
-                确认登记
-              </Button>
-              <Button class="slot-btns-item" @click="switchAssurance(scope.row.id,0)" size="small" type="danger"
-                v-if="scope.row.assurance_status==1&&type==1&&scope.row.is_assurance==1">
-                取消登记
-              </Button>
             </div>
           </template>
         </el-table-column>
       </template>
     </xy-table>
 
-    <div style="display: flex;justify-content: flex-end;">
-      <Page :total="total" show-elevator @on-change="pageChange" show-sizer @on-page-size-change="pageSizeChange" />
+    <div style="display: flex; justify-content: flex-end">
+      <Page
+        :total="total"
+        show-elevator
+        @on-change="pageChange"
+        show-sizer
+        @on-page-size-change="pageSizeChange"
+      />
     </div>
 
-    <!--  新增合同  -->
-    <xy-dialog ref="addContract" :form="form" :is-show.sync="isShowAdd" :rules="rules" title="新增合同" type="form"
-      @submit="submit">
-      <template v-slot:name>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>项目名称
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="form.name" placeholder="请填写项目名称" style="width: 300px;" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:type>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>项目类型
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.type" placeholder="请选择项目类型" style="width: 300px;">
-              <el-option v-for="item in types" :label="item.label" :value="item.value"></el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:methods>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>采购形式
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.methods" placeholder="请选择采购形式" style="width: 300px;">
-              <el-option v-for="item in purchaseType" :label="item.value" :value="item.id"></el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:modality>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>采购类型
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.modality" placeholder="请选择采购类型" style="width: 300px;">
-              <el-option v-for="item in purchaseWay" :label="item.value" :value="item.id"></el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:price>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>合同预算价
-          </div>
-          <div class="xy-table-item-content xy-table-item-price">
-            <el-input v-model="form.price" placeholder="请填写合同预算价" style="width: 300px;" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:fundingChannels>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>资金渠道
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.fundingChannels" multiple placeholder="请选择资金渠道" style="width: 300px;">
-              <el-option v-for="item in moneyWay" :label="item.value" :value="item.id"></el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:isBudget>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="width: 200px;">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否为预算内确定项目
-          </div>
-          <div class="xy-table-item-content">
-            <el-switch v-model="form.isBudget" />
-          </div>
-        </div>
-      </template>
-      <template v-slot:plan>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>关联预算计划
-          </div>
-          <div class="xy-table-item-content">
-            <div class="contract-add-plan" style="width: 300px;" @click="showPlan">
-              <template v-if="form.plan.length > 0">
-                <template v-for="item in form.plan">
-                  <Tag closable color="primary" @on-close="delPlan(item)">{{ item.label }}</Tag>
-                </template>
-              </template>
-              <template v-else>
-                <div class="contract-add-plan-no-plan">请选择关联计划</div>
-              </template>
-            </div>
-          </div>
-        </div>
-      </template>
-    </xy-dialog>
-
-
-
     <!--  搜索使用 预算计划  -->
-    <xy-dialog :is-show.sync="isShowPlanForSearch" title="预算计划" :width="720" @on-ok="planSelectForSearch">
+    <xy-dialog
+      :is-show.sync="isShowPlanForSearch"
+      title="预算计划"
+      :width="720"
+      @on-ok="planSelectForSearch"
+    >
       <template>
-        <Input v-model="planSearch.name" search enter-button="搜 索" placeholder="搜索预算计划.." @on-search="getBudgets" />
-        <div style="margin: 10px 0;display: flex;justify-content: space-between;
-    align-items: center;">
-          <div>已选择：<span style="margin-right:10px">{{select.plan_name}}</span> </div>
-          <el-link type="success" @click="clearSelectForSearch">清空选择</el-link>
-
+        <Input
+          v-model="planSearch.name"
+          search
+          enter-button="搜 索"
+          placeholder="搜索预算计划.."
+          @on-search="searchBudgets"
+        />
+        <div
+          style="
+            margin: 10px 0;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+          "
+        >
+          <div>
+            已选择：<span style="margin-right: 10px">{{
+              select.plan_name
+            }}</span>
+          </div>
+          <el-link type="success" @click="clearSelectForSearch"
+          >清空选择</el-link
+          >
         </div>
-        <xy-table :list="plans" @rowClick="selectPlanForSearch" :show-index="false" :table-item="planTableSearch"
-          :height="310" style="margin-top: 10px;" ref="singlePlanTable">
-          <template v-slot:btns>
-          </template>
+        <xy-table
+          :list="plans"
+          @rowClick="selectPlanForSearch"
+          :show-index="false"
+          :table-item="planTableSearch"
+          :height="310"
+          style="margin-top: 10px"
+          ref="singlePlanTable"
+        >
+          <template v-slot:btns> </template>
         </xy-table>
 
-        <div style="display: flex;justify-content: flex-end;">
+        <div style="display: flex; justify-content: flex-end">
           <Page :total="planTotal" show-elevator @on-change="planPageChange" />
         </div>
         <el-tag type="warning">点击行进行选择</el-tag>
@@ -338,1326 +366,1767 @@
       </template>
     </xy-dialog>
 
-    <!--  新增表 预算计划  -->
-    <xy-dialog :is-show.sync="isShowPlan" :width="720" title="预算计划" @on-ok="planSelect">
-      <template>
-        <div style="display: flex;">
-          <el-select placeholder="科室选择" clearable size="small" v-model="planSearch.plan_department_id"
-            style="width: 160px;">
-            <el-option v-for="item in departments" :label="item.name" :value="item.id" :key="item.id">
-            </el-option>
-          </el-select>
-          <Input v-model="planSearch.name" enter-button="搜 索" placeholder="搜索预算计划.." search @on-search="getBudgets" />
-        </div>
-        <xy-table ref="planTable" :height="300" :list="plans" :show-index="false" :table-item="planTable"
-          style="margin-top: 10px;" @select="selectPlan">
-          <template v-slot:btns>
-            <el-table-column header-align="center" label="使用金额（元）" fixed="right" width="140">
-              <template slot-scope="scope">
-                <Input :value="scope.row.useMoney" @input="planInput($event,scope.row)" />
-              </template>
-            </el-table-column>
-          </template>
-        </xy-table>
-
-        <div style="display: flex;justify-content: flex-end;">
-          <Page :total="planTotal" show-elevator @on-change="planPageChange" />
-        </div>
-      </template>
-
-      <template v-slot:footerContent>
-        <Button type="primary" @click="isShowPlan = false">确定</Button>
-      </template>
-    </xy-dialog>
-
     <!--    编辑-->
-    <editor ref="editor" :is-show-editor.sync="isShowEditor" :money-way="moneyWay" :purchase-type="purchaseType"
-      :purchase-way="purchaseWay" @success="getContracts"></editor>
+    <edit-contract
+      ref="editContract"
+      :flow-ids="flowIds"
+      :group-type="groupType"
+      :money-way="moneyWay"
+      :purchase-type="purchaseType"
+      :purchase-way="purchaseWay"
+      :common-purchase-type="commonPurchaseType"
+      :types="type"
+      :departments="departments"
+      :is-show.sync="isShowEdit"
+      @refresh="getContracts" />
 
     <!--    查看-->
     <detail ref="detailContract"></detail>
 
     <!--付款登记-->
-    <paymentRegistration ref="paymentRegistration"></paymentRegistration>
+    <paymentRegistration
+      ref="paymentRegistration"
+      @paid="paying"
+    ></paymentRegistration>
 
     <!--    合同签订-->
     <contractSign ref="contractSign" @signSuccess="getContracts"></contractSign>
 
     <!--    查看付款计划-->
-    <contractPaymentRegistration ref="contractPaymentRegistration"></contractPaymentRegistration>
+    <contractPaymentRegistration
+      ref="contractPaymentRegistration"
+    ></contractPaymentRegistration>
+
+    <biddingUpload ref="biddingUpload" @refresh="getContracts"></biddingUpload>
+
+    <oaFiles ref="oaFiles"></oaFiles>
+
+    <addContractLedger ref="addContractLedger" @refresh="getContracts"></addContractLedger>
+
+    <!--    oa办理-->
+    <Modal
+      :width="86"
+      class-name="oa-modal"
+      title="流程办理"
+      fullscreen
+      :mask-closable="false"
+      v-model="isShowOaModal"
+      footer-hide
+    >
+      <div style="width: 100%;height: 100%;">
+        <iframe style="width: 100%;height: 100%;border-radius: 0 0 6px 6px;" :src="oaUrl" frameborder="0"></iframe>
+      </div>
+    </Modal>
   </div>
 </template>
 
 <script>
-  import {
-    getContract,
-    addContrant,
-    delContract,
-    editorContract
-  } from "@/api/contract/contract"
-  import {
-    getparameter
-  } from "@/api/system/dictionary"
-  import {
-    listdeptNoAuth
-  } from "@/api/system/department";
-  import {
-    getBudget
-  } from "@/api/budget/budget"
-  import {
-    getOatoken
-  } from "@/api/oatoken"
-  import {
-    parseTime,deepCopy
-  } from "@/utils"
-  import {
-    Message
-  } from "element-ui";
-  import {
-    getInfo
-  } from '@/api/me.js'
-
-  import editor from "./components/editorContract"
-  import detail from "./components/detailContract"
-  import paymentRegistration from "./components/paymentRegistration";
-  import contractSign from "@/views/contract/components/contractSign";
-  import contractPaymentRegistration from "@/views/contract/components/contractPaymentRegistration";
-
-  export default {
-    components: {
-      editor,
-      detail,
-      paymentRegistration,
-      contractSign,
-      contractPaymentRegistration
-    },
-    data() {
-      var planPass = (rule, value, callback) => {
-        if (this.form.isBudget) {
-          if (this.form.plan.length === 0) {
-            return callback(new Error('必选'))
-          } else {
-            callback()
-          }
-        } else {
-          callback()
-        }
-      }
-      return {
-        pageTitle: "合同列表",
-        type: 0, //pageType 合同列表_0 和 履约保函收取登记_1 公用
-        userList: ["liuxiangyu", "zhushulan", "admin", "jiangjiao"],
-        window: {
-          width: 0,
-          height: 0,
-          top: 0,
-          left: 0
-        },
-        hasEdit: false,
-        isShowPlanForSearch: false,
-        options: [{
+import {
+  getContract,
+  addContrant,
+  delContract,
+  checkContractName,
+  editorContract,
+  detailContract,
+} from "@/api/contract/contract";
+import {getparameter, getparameterTree} from "@/api/system/dictionary";
+import { listdeptNoAuth } from "@/api/system/department";
+import { getBudget } from "@/api/budget/budget";
+import { getOatoken } from "@/api/oatoken";
+import { deepCopy, parseTime, resetSelect, moneyFormatter, throttle } from '@/utils'
+import { Message } from "element-ui";
+import { getInfo } from "@/api/me.js";
+import { getToken } from "@/utils/auth";
+import editor from "./components/editorContract";
+import detail from "./components/detailContract";
+import paymentRegistration from "./components/paymentRegistration";
+import contractSign from "@/views/contract/components/contractSign";
+import contractPaymentRegistration from "@/views/contract/components/contractPaymentRegistration";
+import biddingUpload from "./components/biddingUpload.vue";
+import oaFiles from './components/oaFiles.vue';
+import addContractLedger from '@/views/contract/components/addContractLedger.vue'
+import EditContract from './components/EditContract.vue'
+import { show } from "@/api/away";
+let iframe;
+export default {
+  components: {
+    addContractLedger,
+    editor,
+    detail,
+    paymentRegistration,
+    contractSign,
+    contractPaymentRegistration,
+    biddingUpload,
+    oaFiles,
+    EditContract
+  },
+  data() {
+    return {
+      isShowEdit: false,
+      isShowOaModal: false,
+      oaUrl: "",
+      //事前流程
+      flowIds: [{"name":"政府采购流转","id":71,"type":2},{"name":"公务接待","id":86,"type":1},{"name":"会议费用","id":87,"type":1},{"name":"培训费","id":88,"type":1},{"name":"用印","id":76,"type":1},{"name":"仪器设备维修流转","id":84,"type":1},{"name":"请休假","id":68,"type":1},{"name":"仪器设备购置流转","id":82,"type":1},{"name":"安装、维修流转","id":96,"type":1},{"name":"车船维修保养流转","id":97,"type":1}],
+
+      isShowIsFramework: true,
+      userList: ["admin"],
+      nowContract: {},
+      window: {
+        width: 0,
+        height: 0,
+        top: 0,
+        left: 0,
+      },
+      hasEdit: false,
+      isShowPlanForSearch: false,
+      options: [
+        {
           value: "",
-          label: '全部'
-        }, {
+          label: "全部",
+        },
+        {
           value: 1,
-          label: '待申请'
-        }, {
+          label: "待申请",
+        },
+        {
           value: 2,
-          label: '流转中'
-        }, {
+          label: "流转中",
+        },
+        {
           value: 3,
-          label: '已办结'
-        }],
-
-        //搜索
-        select: {
-          keyword: "",
-          showDatePicker: "",
-          pageIndex: 1,
-          pageSize: 10,
-          startDate: "",
-          endDate: "",
-          type: "",
-          department_id: "",
-          purchaseModality: "",
-          purchaseMethods: "",
-          status: "",
-          year: "",
-          plan_id: "",
-          outcome_type: 1,
-          plan_name: "请选择预算计划",
-          start_plan_price: undefined,
-          end_plan_price: undefined,
-          is_myself: 0,
-          is_purchase: 1,
+          label: "已办结",
+        },
+      ],
+
+      //搜索
+      select: {
+        keyword: "",
+        showDatePicker: "",
+        pageIndex: 1,
+        pageSize: 10,
+        startDate: "",
+        endDate: "",
+        type: "",
+        department_id: "",
+        purchaseModality: "",
+        purchaseMethods: "",
+        status: "",
+        year: "",
+        plan_id: "",
+        outcome_type: 1,
+        plan_name: "请选择预算计划",
+        start_plan_price: undefined,
+        end_plan_price: undefined,
+        is_myself: 0,
+        is_purchase: 1,
+      },
+      selectCopy: {
+        keyword: "",
+        showDatePicker: "",
+        pageIndex: 1,
+        pageSize: 10,
+        startDate: "",
+        endDate: "",
+        type: "",
+        department_id: "",
+        purchaseModality: "",
+        purchaseMethods: "",
+        status: "",
+        year: "",
+        plan_id: "",
+        outcome_type: 1,
+        plan_name: "请选择预算计划",
+        start_plan_price: undefined,
+        end_plan_price: undefined,
+        is_myself: 0,
+        is_purchase: 1,
+      },
+      type: [
+        {
+          label: "服务",
+          value: 1,
         },
-        selectCopy: {
-          keyword: "",
-          showDatePicker: "",
-          pageIndex: 1,
-          pageSize: 10,
-          startDate: "",
-          endDate: "",
-          type: "",
-          department_id: "",
-          purchaseModality: "",
-          purchaseMethods: "",
-          status: "",
-          year: "",
-          plan_id: "",
-          outcome_type: 1,
-          plan_name: "请选择预算计划",
-          start_plan_price: undefined,
-          end_plan_price: undefined,
-          is_myself: 0,
-          is_purchase: 1,
+        {
+          label: "货物",
+          value: 2,
+        },
+        {
+          label: "工程",
+          value: 3,
+        },
+      ],
+      groupType: [],//组织形式
+      purchaseType: [], //购买形式
+      purchaseWay: [], //购买方式
+      moneyWay: [], //资金渠道
+      commonPurchaseType: [],//一般采购类型
+      departments: [], //部门科室
+      list: [], //数据
+      total: 0,
+      //表格
+      ledgerTable: [
+        {
+          label: "项目名称",
+          width: 380,
+          prop: "name",
+          fixed: "left",
+          align: "left",
+        },
+        {
+          label: "合同编号",
+          width: 200,
+          prop: 'number',
+          align: 'center'
+        },
+        {
+          label: "合同类型",
+          prop: "contract_type",
+          width: 140,
+          formatter:(cell, data, value) => {
+            let map = new Map([
+              [1,'收入类'],
+              [2,'支出类'],
+              [3,'技术协议']
+            ])
+            return map.get(value)
+          }
         },
-        types: [{
-          label: '服务',
-          value: 1
-        }, {
-          label: '货物',
-          value: 2
-        }, {
-          label: '工程',
-          value: 3
-        }],
-        purchaseType: [], //购买形式
-        purchaseWay: [], //购买方式
-        moneyWay: [], //资金渠道
-        departments: [], //部门科室
-        list: [], //数据
-        total: 0,
-        //表格
-        table: [{
-            label: "项目名称",
-            width: 340,
-            prop: 'name',
-            fixed: 'left',
-            align: 'left'
+        {
+          label: "合同签订价(元)",
+          width: 140,
+          prop: "money",
+          align: "right",
+          formatter: (cell, data, value) => {
+            return Number(value)
+              .toFixed(2)
+              .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
           },
-          {
-            label: "采购形式",
-            width: 120,
-            prop: 'purchase_type.value'
+        },
+        {
+          label: "支付占比",
+          width: 140,
+          customFn: (row) => {
+            let per =
+              ((row.fund_log_total / row.money || 0) * 100)?.toFixed(2) || 0;
+            return (
+              <div
+                style={{
+                  color: per > 110 ? "red" : "green",
+                }}
+              >
+                {" "}
+                {per} %
+              </div>
+            );
           },
-          {
-            label: "项目类型",
-            width: 120,
-            prop: 'type',
-            formatter: (cell, data, value) => {
-
-              switch (value) {
-                case 1:
-                  return "服务"
-                  break;
-                case 2:
-                  return "货物"
-                  break;
-                case 3:
-                  return "工程"
-                  break;
-                default:
-                  return "未知"
-              }
+        },
+        {
+          label: "付款计划",
+          prop: "sign_plan_count",
+          width: 120,
+          formatter: (cell, data, value) => {
+            if (value == 0) return "暂无";
+            return value + "期";
+          },
+          customFn:row => {
+            let text = "暂无";
+            if (row.sign_plan_count && row.sign_plan_count != 0) text = row.sign_plan_count + '期';
+            return (<a style="text-decoration: underline;">{text}</a>)
+          }
+        },
+        {
+          label: "供应商/服务商",
+          width: 220,
+          prop: "supply",
+          align: "left",
+        },
+        {
+          label: "业务科室",
+          width: 140,
+          prop: "department.name",
+        },
+        {
+          label: "经办人",
+          width: 140,
+          prop: "admin.name",
+        },
+        {
+          label: "合同服务日期",
+          width: 200,
+          customFn: (row) => {
+            if (row.start_date && row.end_date) {
+              return (
+                <div>
+                  <span>
+                    {row.start_date} ~ {row.end_date}
+                  </span>
+                </div>
+              );
+            } else {
+              return <span></span>;
             }
           },
-          {
-            label: "采购流程",
-            multiHd: [
-              // {
-              //   label: "请示流程",
-              //   width: 140,
-              //   prop: 'req_status',
-              //   formatter: (cell, data, value) => {
-              //     if (cell.is_plan === 1) {
-              //       return '无'
-              //     }
-              //     switch (value) {
-              //       case 1:
-              //         return "待申请"
-              //         break;
-              //       case 2:
-              //         return "流转中"
-              //         break;
-              //       case 3:
-              //         return "已办结"
-              //         break;
-              //       default:
-              //         return "异常"
-              //         break;
-              //     }
-              //   }
-              // },
-              {
-                label: "采购业务审批流程",
-                width: 158,
-                prop: 'purchase_status',
-                formatter: (cell, data, value) => {
-                  switch (value) {
-                    case 1:
-                      return "待申请"
-                      break;
-                    case 2:
-                      return "流转中"
-                      break;
-                    case 3:
-                      return "已办结"
-                      break;
-                    default:
-                      return "异常"
-                      break;
-                  }
-                }
-              },
-              {
-                label: "招标审核流程",
-                width: 145,
-                prop: 'invite_status',
-                formatter: (cell, data, value) => {
-                  if (cell.purchase_way?.remark === 'false') {
-                    return '无'
-                  }
-                  switch (value) {
-                    case 1:
-                      return "待申请"
-                      break;
-                    case 2:
-                      return "流转中"
-                      break;
-                    case 3:
-                      return "已办结"
-                      break;
-                    default:
-                      return "异常"
-                      break;
-                  }
-                }
-              },
-              {
-                label: "合同会签流程",
-                width: 145,
-                prop: 'join_status',
-                formatter: (cell, data, value) => {
-                  switch (value) {
-                    case 1:
-                      return "待申请"
-                      break;
-                    case 2:
-                      return "流转中"
-                      break;
-                    case 3:
-                      return "已办结"
-                      break;
-                    default:
-                      return "异常"
-                      break;
-                  }
-                }
-              }
-            ]
+        },
+        {
+          label: '费用年占比',
+          width: 160,
+          customFn: row => {
+            const { start_date, end_date, money } = row
+            if (!start_date || !end_date) {
+              return (<span>/</span>)
+            }
+            const startYear = new Date(start_date).getFullYear()
+            const endYear = new Date(end_date).getFullYear()
+
+            if (startYear === endYear) {
+              return (<p><span style="font-weight: 600;">[{startYear}]</span><span>{moneyFormatter(money)}</span></p>)
+            } else {
+              const startMonths = 12 - new Date(start_date).getMonth()
+              const endMonths = new Date(end_date).getMonth() + 1
+              return(
+                <div>
+                  <p>
+                    <span style="font-weight: 600;">[{startYear}]</span><span>{moneyFormatter(money*startMonths/(startMonths+endMonths))}</span>
+                  </p>
+                  <p>
+                    <span style="font-weight: 600;">[{endYear}]</span><span>{moneyFormatter(money*endMonths/(startMonths+endMonths))}</span>
+                  </p>
+                </div>
+              )
+            }
+          }
+        },
+        {
+          label: "签订日期",
+          width: 160,
+          prop: "date",
+          formatter: (cell, data, value) => {
+            if (value) return parseTime(new Date(value), "{y}-{m}-{d}");
           },
-          {
-            label: "采购方式",
-            width: 120,
-            prop: "purchase_way.value"
+        },
+        {
+          label: "创建日期",
+          width: 160,
+          prop: "created_at",
+          formatter: (cell, data, value) => {
+            return parseTime(new Date(value), "{y}-{m}-{d}");
           },
-          {
-            label: "资金来源",
-            width: 120,
-            customFn: (row) => {
-              {
-                return row.money_way_detail.map(item => {
-                    return ( < div > {
-                        item.value
-                      } < /div>)
-                    })
-                }
-
-              }
-            },
-            {
-              label: "预算计划",
-              width: 320,
-              align: "left",
-              customFn: (row) => {
+        },
+        {
+          label: "附件",
+          width: 200,
+          prop: "files",
+          customFn: row => {
+            return (
+              <div>
                 {
-                  return row.plans.map(item => {
-                      return ( < div > {
-                          item.name
-                        } < /div>)
-                      })
-                  }
-
+                  row.files_detail.map(i => (<a style="color: red;" href={i.url} download={i.original_name} target="_blank">{i.original_name}</a>))
                 }
-              },
-              {
-                 label: "合同预算价(元)",
-                 width: 140,
-                 prop: "plan_price",
-                 align: 'right',
-                 formatter: (v1, v2, value) => {
-                     return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
-                 }
-              },
-              {
-                label: '已申请金额(元)',
-                prop: 'apply_money_total',
-                width: 140,
-                align: 'right',
-                formatter: (cell, data, value) => {
-                  return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
-                }
-              },
-              {
-                label: '已付金额(元)',
-                prop: 'fund_log_total',
-                width: 140,
-                align: 'right',
-                formatter: (cell, data, value) => {
-                  return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
-                }
-              },
-              {
-                label: '支付占比',
-                width: 140,
-                customFn: (row) => {
-                  let per = ((((row.fund_log_total) / row.money) || 0) * 100)?.toFixed(2) || 0
-                  return ( <
-                    div style = {
-                      {
-                        'color': per > 110 ? 'red' : 'green'
-                      }
-                    } > {
-                      per
-                    } %
-                    <
-                    /div>
-                  )
-                }
-              },
-
-              {
-                label: '合同签订价(元)',
-                width: 140,
-                prop: 'money',
-                align: 'right',
-                formatter: (cell, data, value) => {
-                  return Number(value).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
-                }
-              },
-              {
-                label: "合同状态",
-                width: 120,
-                prop: "status",
-                formatter: (cell, data, value) => {
-                  switch (value) {
-                    case 1:
-                      return "待签订"
-                      break;
-                    case 2:
-                      return "已签订"
-                      break;
-                    default:
-                      return "未知"
+              </div>
+            )
+          }
+        }
+      ],
+      flowStatus: new Map([
+        [2, "待申请"],
+        [-1, "已退回"],
+        [-2, "-"],
+        [0, "流转中"],
+        [1, "已办结"]
+      ]),
+      flowStatusColor: new Map([
+        [-2, "rgb(140, 140, 140)"],
+        [-1, "#dca550"],
+        [2, "rgb(96, 109, 241)"],
+        [0, "rgb(219, 122, 122)"],
+        [1, "rgb(147, 201, 134)"]
+      ]),
+      table: [
+        {
+          label: "项目名称",
+          width: 380,
+          prop: "name",
+          fixed: "left",
+          align: "left",
+          customFn:row => {
+            if (row.type === 1 && row.end_date && (this.$moment().valueOf() - this.$moment(row.end_date).valueOf()) > 0) {
+              return (<span style="color: red;"><span>【已到期】</span><span>{row.name}</span></span>)
+            } else {
+              return (
+                <span>{row.name}</span>
+              )
+            }
+          }
+        },
+        {
+          label: "采购形式",
+          width: 120,
+          prop: "purchase_type.value",
+          formatter: (cell, data, value) => {
+            return value ? value : "无";
+          },
+        },
+        {
+          label: "项目类型",
+          width: 120,
+          prop: "type",
+          formatter: (cell, data, value) => {
+            switch (value) {
+              case 1:
+                return "服务";
+                break;
+              case 2:
+                return "货物";
+                break;
+              case 3:
+                return "工程";
+                break;
+              default:
+                return "无";
+            }
+          }
+        },
+        {
+          label: "事前流程",
+          prop: "flow_mod_id",
+          width: 200,
+          hidden: !/contractAll/g.test(this.$route.path),
+          customFn:row => {
+            return (
+              <div>
+                <p>
+                  <span>
+                    {
+                      this.flowIds.find(i => i.id === row.flow_mod_id)?.name
+                    }
+                  </span>
+                  {
+                    row.is_purchase ? "" : (<span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.other.getStatus()) }}>[{ this.flowStatus.get(row.FLOWSTATUS.other.getStatus()) ?? '待申请' }]</span>)
                   }
+                </p>
+                {
+                  (!row.is_purchase && row.FLOWSTATUS.other.getStatus() > 1) ? (<a on={{['click']:()=>this.toOaDetail('other',row)}}>查看</a>) : ""
                 }
-              },
-              {
-                label: "结算状态",
-                width: 120,
-                prop: "is_end",
-                formatter: (cell, data, value) => {
-                  return value === 0 ? "未结清" : "已结清";
-                }
-              },
-              {
-                label: '付款计划',
-                prop: 'sign_plan_count',
-                width: 120,
-                formatter: (cell, data, value) => {
-                  if (value == 0) return '暂无'
-                  return value + '期'
-                }
-              },
-              {
-                label: "业务科室",
-                width: 140,
-                prop: 'department.name'
-              },
-              {
-                label: "经办人",
-                width: 140,
-                prop: 'admin.name'
-              },
-              {
-                label: "供应商/服务商",
-                width: 220,
-                prop: 'supply',
-                align: "left"
-              },
-          {
-            label: "合同服务日期",
-            width: 200,
-            customFn:row => {
-              if(row.start_date && row.end_date){
+              </div>
+            )
+          }
+        },
+        {
+          label: "采购流程",
+          multiHd: [
+            {
+              label: "采购业务审批流程",
+              width: 158,
+              prop: "purchase_status",
+              customFn:row => {
                 return (
                   <div>
-                    <span>{row.start_date} ~ {row.end_date}</span>
+                    <span style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.caigou.getStatus()) }}>{ this.flowStatus.get(row.FLOWSTATUS.caigou.getStatus()) || '无' }</span>
+                    <br/>
+                    {
+                      (row.FLOWSTATUS.caigou.getStatus() !== 2 && row.FLOWSTATUS.caigou.getStatus() !== -2) ? <a style="color: #333" on={{['click']:()=>this.toOaDetail('caigou',row)}}>查看</a> : ''
+                    }
                   </div>
                 )
-              }else{
+              }
+            },
+            {
+              label: "招标审核流程",
+              width: 145,
+              prop: "invite_status",
+              customFn:row => {
                 return (
-                  <span></span>
+                  <div>
+                    <div style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.zhaobiao.getStatus()), 'display': 'flex', 'align-items': 'center', 'justify-content': 'center' }}>
+                      <span>{ this.flowStatus.get(row.FLOWSTATUS.zhaobiao.getStatus()) || '无' }</span>
+                    </div>
+                    {
+                      (row.FLOWSTATUS.zhaobiao.getStatus() !== 2 && row.FLOWSTATUS.zhaobiao.getStatus() !== -2) ? <a style="color: #333" on={{['click']:()=>{
+                          this.$refs['biddingUpload'].setId(row.id)
+                          this.$refs['biddingUpload'].show()
+                        }}}>查看</a> : ''
+                    }
+                  </div>
                 )
               }
-            }
-          },
-              {
-                label: "签订日期",
-                width: 160,
-                prop: 'date',
-                formatter: (cell, data, value) => {
-                  if (value)
-                    return parseTime(new Date(value), "{y}-{m}-{d}")
-                }
-              },
-              {
-                label: "创建日期",
-                width: 160,
-                prop: 'created_at',
-                formatter: (cell, data, value) => {
-                  return parseTime(new Date(value), "{y}-{m}-{d}")
-                }
-              }
-            ],
-            //履约单表格
-            table1: [{
-                label: "项目名称",
-                width: 340,
-                prop: 'name',
-                fixed: 'left',
-                align: 'left'
-              },
-              {
-                label: "项目类型",
-                width: 120,
-                prop: 'type',
-                formatter: (cell, data, value) => {
-                  switch (value) {
-                    case 1:
-                      return "服务"
-                      break;
-                    case 2:
-                      return "货物"
-                      break;
-                    case 3:
-                      return "工程"
-                      break;
-                    default:
-                      return "未知"
-                  }
-                }
-              },
-              {
-                prop: 'assurance_expire',
-                label: '保函有效期',
-                width: 180
-              },
-              {
-                prop: 'assurance_money',
-                label: '保函金额(元)',
-                width: 180
-              },
-              {
-                prop: 'supply',
-                label: '承包商/供应商',
-                width: 200,
-                align: 'left'
-              },
-              {
-                label: "业务科室",
-                width: 140,
-                prop: 'department.name'
-              },
-              {
-                label: "经办人",
-                width: 140,
-                prop: 'admin.name'
-              },
-            ],
-            //总计
-            tableTotal: {
-              fundLogTotal: 0,
-              moneyTotal: 0,
-              planPriceTotal: 0
             },
-
-            planTypes: [],
-            planTableSearch: [{
-                label: "分类",
-                prop: 'type',
-                formatter: (cell, data, value) => {
-                  let res = this.moneyWay.filter(item => {
-                    return item.id === value
-                  })
-                  return res[0]?.value || '未知'
-                }
-              },
-              {
-                label: "年份",
-                prop: 'year',
-                align: 'center'
-              },
-              {
-                label: "名称",
-                prop: 'name',
-                align: 'left'
-              },
-              {
-                label: "计划金额",
-                prop: 'money',
-                align: 'right'
-              }
-            ],
-            planTable: [{
-                width: 36,
-                sortable: false,
-                type: 'selection',
-                fixed: "left"
-              },
-              {
-                label: "分类",
-                prop: 'type',
-                formatter: (cell, data, value) => {
-                  let res = this.moneyWay.filter(item => {
-                    return item.id === value
-                  })
-                  return res[0]?.value || '未知'
-                },
-                width: 100,
-                fixed: "left"
-              },
-
-              {
-                label: "科室",
-                prop: 'plan_department.name',
-                width: 100,
-                align: 'center'
-              },
-              {
-                label: "年份",
-                prop: 'year',
-                width: 80,
-                align: 'center'
-              },
-              {
-                label: "名称",
-                prop: 'name',
-                width: 320,
-                align: 'left'
-              },
-              {
-                label: "计划金额",
-                prop: 'money',
-                align: 'right',
-                width: 120
+            {
+              label: "合同审批流程",
+              width: 145,
+              prop: "join_status",
+              customFn:row => {
+                return (
+                  <div>
+                    <div style={{ 'color': this.flowStatusColor.get(row.FLOWSTATUS.shenpi.getStatus()), 'display': 'flex', 'align-items': 'center', 'justify-content': 'center' }}>
+                      <span>{ this.flowStatus.get(row.FLOWSTATUS.shenpi.getStatus()) }</span>
+                    </div>
+                    {
+                      (row.FLOWSTATUS.shenpi.getStatus() !== 2 && row.FLOWSTATUS.shenpi.getStatus() !== -2) ? <a style="color: #333" on={{['click']:()=>this.toOaDetail('hetong',row)}}>查看</a> : ''
+                    }
+                  </div>
+                )
               }
-            ],
-
-
-            //新增
-            isShowAdd: false,
-            form: {
-              name: "",
-              type: "",
-              methods: "",
-              modality: "",
-              price: "",
-              fundingChannels: [],
-              isBudget: true,
-              plan: []
             },
-            plan: [],
-            rules: {
-              name: [{
-                required: true,
-                message: "必填"
-              }],
-              type: [{
-                required: true,
-                message: "必选"
-              }],
-              methods: [{
-                required: true,
-                message: "必选"
-              }],
-              modality: [{
-                required: true,
-                message: "必选"
-              }],
-              price: [{
-                  required: true,
-                  message: "必填"
-                },
-                {
-                  pattern: /^\d+(\.\d+)?$/,
-                  message: '必须为数字'
-                }
-              ],
-              fundingChannels: [{
-                required: true,
-                message: "必填"
-              }],
-              plan: [{
-                validator: planPass,
-                trigger: 'change'
-              }]
-            },
-            isShowPlan: false, //新增中预算计划
-            plans: [], //预算数据
-            planSearch: {
-              name: "",
-              plan_department_id: ""
-            },
-            planTotal: 0,
-            plansPageIndex: 1,
-
-            isShowEditor: false,
-          }
-        },
-        created() {
-          let type = parseInt(this.$route.path.split("_")[1]);
-          this.type = type;
-          this.pageTitle = type == 1 ? "履约保函收取登记" : "合同列表";
-          if (type == 1) {
-            this.select.is_assurance = 1;
-          }
+          ],
         },
-        methods: {
-          reset () {
-            this.select = deepCopy(this.selectCopy)
-          },
-          searchContracts() {
-            this.select.pageIndex = 1;
-            this.getContracts();
-
-          },
-          clearSelectForSearch() {
-            this.select.plan_id = "";
-            this.select.plan_name = "请选择预算计划";
-
+        {
+          label: "组织形式",
+          width: 120,
+          prop: "group_type_detail.value",
+          formatter: (cell, data, value) => {
+            return value ? value : "无";
           },
-          async getPlanTypes() {
-            const res = await getparameter({
-              number: 'money_way'
-            })
-            this.planTypes = res.detail
-            console.log(this.planTypes)
+        },
+        {
+          label: "采购方式",
+          width: 120,
+          prop: "purchase_way.value",
+          formatter: (cell, data, value) => {
+            return value ? value : "无";
           },
-
-          //预算计划金额输入
-          planInput(e, row) {
-            if (!/^[0-9]+.?[0-9]*$/.test(e) && e) {
-              Message({
-                type: 'warning',
-                message: '金额格式错误'
-              })
-              row.useMoney = 0
-              return
+        },
+        {
+          label: "资金来源",
+          width: 120,
+          customFn: (row) => {
+            {
+              return row.money_way_detail.map((item) => {
+                return <div> {item.value} </div>;
+              });
             }
-            if (e <= (Number(row.money) - Number(row.use_money_total))) {
-              row.useMoney = e
-              this.plan.forEach(item => {
-                if (item.value.plan_id == row.id) {
-                  item.value.use_money = e
-                }
-              })
-              return
+          },
+        },
+        {
+          label: "预算计划",
+          width: 330,
+          align: "left",
+          customFn: (row) => {
+            {
+              return row.plans.map((item) => {
+                return (
+                  <div>
+                    {" "}
+                    [{item.year}] {item.pid_info ? item.pid_info.name : ''} - {item.name}{" "}
+                  </div>
+                );
+              });
             }
-            Message({
-              type: 'warning',
-              message: '使用金额大于剩余预算'
-            })
-            row.useMoney = 0
           },
-          //合计
-          summary(param) {
-            this.$nextTick(() => {
-              this.$refs['xyTable'].$children[0].doLayout()
-            })
-            const {
-              columns,
-              data
-            } = param
-            const sums = []
-            columns.map((column, index) => {
-              if (index === 0) {
-                sums[index] = '总计'
-                return
-              }
-              if (column.property === 'fund_log_total') {
-                sums[index] = this.tableTotal.fundLogTotal
-                return
-              }
-              if (column.property === 'plan_price') {
-                sums[index] = this.tableTotal.planPriceTotal
-                return
-              }
-              if (column.property === 'money') {
-                sums[index] = this.tableTotal.moneyTotal
-                return
-              }
-
-              // const values = data.map(item => Number(item[column.property]));
-              // if (!values.every(value => isNaN(value)) && (column.property === 'money' || column.property === 'plan_price'|| column.property === 'fund_log_total')) {
-              //
-              //   sums[index] = sums[index].toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
-              // } else {
-              //   sums[index] = '';
-              // }
-            })
-
-            return sums
+        },
+        {
+          label: "合同预算价(元)",
+          width: 140,
+          prop: "plan_price",
+          align: "right",
+          formatter: (v1, v2, value) => {
+            return Number(value)
+              .toFixed(2)
+              .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
           },
-          cellStyle({
-            row,
-            column,
-            rowIndex,
-            columnIndex
-          }) {
-            if (column.property === 'req_status') {
-              if (row.is_plan === 1) {
-                return {
-                  'color': 'rgb(140,140,140)'
-                }
-              }
-              switch (row.req_status) {
-                case 1:
-                  return {
-                    'color': 'rgb(96,109,241)'
-                  }
-                  break;
-                case 2:
-                  return {
-                    'color': 'rgb(219,122,122)'
-                  }
-                  break;
-                case 3:
-                  return {
-                    'color': 'rgb(147,201,134)'
-                  }
-                  break;
-                default:
-                  return {
-                    'color': 'rgb(220,185,126)'
-                  }
-              }
-            }
-            if (column.property === 'purchase_status') {
-              switch (row.purchase_status) {
-                case 1:
-                  return {
-                    'color': 'rgb(96,109,241)'
-                  }
-                  break;
-                case 2:
-                  return {
-                    'color': 'rgb(219,122,122)'
-                  }
-                  break;
-                case 3:
-                  return {
-                    'color': 'rgb(147,201,134)'
-                  }
-                  break;
-                default:
-                  return {
-                    'color': 'rgb(220,185,126)'
-                  }
-              }
-            }
-            if (column.property === 'invite_status') {
-              if (row.purchase_way?.remark === 'false') {
-                return {
-                  'color': 'rgb(140,140,140)'
-                }
-              }
-              switch (row.invite_status) {
-                case 1:
-                  return {
-                    'color': 'rgb(96,109,241)'
-                  }
-                  break;
-                case 2:
-                  return {
-                    'color': 'rgb(219,122,122)'
-                  }
-                  break;
-                case 3:
-                  return {
-                    'color': 'rgb(147,201,134)'
-                  }
-                  break;
-                default:
-                  return {
-                    'color': 'rgb(220,185,126)'
-                  }
-              }
-            }
-            if (column.property === 'join_status') {
-              switch (row.join_status) {
-                case 1:
-                  return {
-                    'color': 'rgb(96,109,241)'
-                  }
-                  break;
-                case 2:
-                  return {
-                    'color': 'rgb(219,122,122)'
-                  }
-                  break;
-                case 3:
-                  return {
-                    'color': 'rgb(147,201,134)'
-                  }
-                  break;
-                default:
-                  return {
-                    'color': 'rgb(220,185,126)'
-                  }
-              }
-            }
+        },
+        {
+          label: "合同签订价(元)",
+          width: 140,
+          prop: "money",
+          align: "right",
+          formatter: (cell, data, value) => {
+            return Number(value)
+              .toFixed(2)
+              .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
           },
-          confirmPlanForSearch() {
-            this.isShowPlanForSearch = false;
-            this.getContracts();
+        },
+        {
+          label: "已申请金额(元)",
+          prop: "apply_money_total",
+          width: 140,
+          align: "right",
+          formatter: (cell, data, value) => {
+            return Number(value)
+              .toFixed(2)
+              .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
           },
-
-          //点击付款计划查看
-          showPaymentPlan(row, column, cell) {
-            if (column.property === 'sign_plan_count') {
-              this.$refs['contractPaymentRegistration'].getSignPlan(row.id)
-              row.status === 2 ? this.$refs['contractPaymentRegistration'].isSign = true : this.$refs[
-                'contractPaymentRegistration'].isSign = false
-              this.$refs['contractPaymentRegistration'].isShow = true
-            }
-            if (column.property === 'fund_log_total') {
-              this.$router.push(`/contract/paymentRegistrationList?contractId=${row.id}`)
-            }
+        },
+        {
+          label: "已付金额(元)",
+          prop: "fund_log_total",
+          width: 140,
+          align: "right",
+          formatter: (cell, data, value) => {
+            return Number(value)
+              .toFixed(2)
+              .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
           },
-          //招标文件审查
-          async bidding(row) {
-            let baseInfo = {
-              "项目名称": row?.name,
-              "项目预算（元）": row?.plan_price
-            }
-            let res = await getOatoken()
-            let url =
-              `${process.env.VUE_APP_OUT_URL}/admin/flow/create/27?oatoken=${res.oatoken}&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}`
-            let bidding = window.open(url, 'bidding',
-              `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
-            )
+        },
+        {
+          label: "支付占比",
+          width: 140,
+          customFn: (row) => {
+            let per =
+              ((row.fund_log_total / row.money || 0) * 100)?.toFixed(2) || 0;
+            return (
+              <div
+                style={{
+                  color: per > 110 ? "red" : "green",
+                }}
+              >
+                {" "}
+                {per} %
+              </div>
+            );
           },
-
-          //采购流程
-          async buyProcess(row) {
-            let baseInfo = {
-              "项目名称": row?.name,
-              "采购形式": row?.purchase_type?.value,
-              "采购方式": row?.purchase_way?.value,
-              "项目类型": this.types.filter(item => {
-                return item.value === row.type
-              })[0]?.label,
-              "资金渠道": row?.money_way?.value,
-              "项目预算（元）": row?.plan_price
+        },
+        {
+          label: "合同状态",
+          width: 120,
+          prop: "status",
+          formatter: (cell, data, value) => {
+            switch (value) {
+              case 1:
+                return "待签订";
+                break;
+              case 2:
+                return "已签订";
+                break;
+              default:
+                return "未知";
             }
-            let res = await getOatoken()
-            let url =
-              `${process.env.VUE_APP_OUT_URL}/admin/flow/create/2?oatoken=${res.oatoken}&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}`
-            let buyProcess = window.open(url, 'buyProcess',
-              `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
-            )
           },
-          //会签流程
-          async signProcess(row) {
-            let baseInfo = {
-              "合同名称": row?.name,
-              "执行部门": row?.carry_department,
-              "合同金额（元）": row?.money,
-              //"承包商\\供应商":row.supply
-            }
-            let res = await getOatoken()
-            let url =
-              `${process.env.VUE_APP_OUT_URL}/admin/flow/create/3?oatoken=${res.oatoken}&out_contract_id=${row.id}&contract_json=${JSON.stringify(baseInfo)}`
-            let signProcess = window.open(url, 'signProcess',
-              `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
-            )
+        },
+        {
+          label: "结算状态",
+          width: 120,
+          prop: "is_end",
+          formatter: (cell, data, value) => {
+            return value === 0 ? "未结清" : "已结清";
           },
-          //请示流程
-          async askProcess(row) {
-            let res = await getOatoken()
-            let url =
-              `${process.env.VUE_APP_OUT_URL}/admin/flow/create/17?oatoken=${res.oatoken}&out_contract_id=${row.id}`
-            let askProcess = window.open(url, 'askProcess',
-              `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
-            )
+        },
+        {
+          label: "付款计划",
+          prop: "sign_plan_count",
+          width: 120,
+          formatter: (cell, data, value) => {
+            if (value == 0) return "暂无";
+            return value + "期";
           },
-
-          //防抖
-          debounce(fn, delay = 500) {
-            let timer = null
-            return function _debounce() {
-              if (timer) clearTimeout(timer)
-              timer = setTimeout(() => {
-                fn()
-              }, delay)
+        },
+        {
+          label: "供应商/服务商",
+          width: 220,
+          prop: "supply",
+          align: "left",
+        },
+        {
+          label: "业务科室",
+          width: 140,
+          prop: "department.name",
+        },
+        {
+          label: "经办人",
+          width: 140,
+          prop: "admin.name",
+        },
+        {
+          label: "合同服务日期",
+          width: 200,
+          customFn: (row) => {
+            if (row.start_date && row.end_date) {
+              return (
+                <div>
+                  <span>
+                    {row.start_date} ~ {row.end_date}
+                  </span>
+                </div>
+              );
+            } else {
+              return <span></span>;
             }
           },
-
-          //翻页
-          pageChange(e) {
-            this.select.pageIndex = e
-            this.getContracts()
-          },
-          planPageChange(e) {
-            this.plansPageIndex = e
-            this.getBudgets()
+        },
+        {
+          label: "签订日期",
+          width: 160,
+          prop: "date",
+          formatter: (cell, data, value) => {
+            if (value) return parseTime(new Date(value), "{y}-{m}-{d}");
           },
-          //日期选择
-          datePick(e) {
-            this.select.start_created_at = e[0]
-            this.select.end_created_at = e[1]
+        },
+        {
+          label: "创建日期",
+          width: 160,
+          prop: "created_at",
+          formatter: (cell, data, value) => {
+            return parseTime(new Date(value), "{y}-{m}-{d}");
           },
+        },
+      ],
+      //总计
+      tableTotal: {
+        fundLogTotal: 0,
+        moneyTotal: 0,
+        planPriceTotal: 0,
+      },
+
+      planTypes: [],
+      planTableSearch: [
+        {
+          label: "分类",
+          prop: "type_detail.value",
+        },
+        {
+          label: "年份",
+          prop: "year",
+          align: "center",
+        },
+        {
+          label: "名称",
+          prop: "name",
+          align: "left",
+        },
 
-          //日期选择
-          datePickBao(e) {
-            this.select.start_assurance_expire = e[0]
-            this.select.end_assurance_expire = e[1]
-          },
-          //获取预算计划
-          async getBudgets() {
-            let res = await getBudget({
-              name: this.planSearch.name,
-              page_size: 10,
-              page: this.plansPageIndex,
-              plan_department_id: this.planSearch.plan_department_id
-            })
-            this.plans = res.list.data
-            this.planTotal = res.list.total
+        {
+          label: "计划金额",
+          prop: "money",
+          align: "right",
+          width: 120,
+          customFn: (row) => {
+            let m1 = row.money;
+            let m2 = row.update_money;
+
+            return m2 == 0 ? m1 : m2;
           },
-          //获取资金渠道
-          async getMoneyWay() {
-            this.moneyWay = (await getparameter({
-              number: 'money_way'
-            })).detail
+        },
+      ],
+      planTable: [
+        {
+          width: 44,
+          sortable: false,
+          type: "selection",
+          fixed: "left",
+          selectable: (row, index) => {
+            return row.pid === 0
+          }
+        },
+        {
+          label: "分类",
+          prop: "type_detail.value",
+          width: 100,
+          fixed: "left",
+        },
+
+        {
+          label: "科室",
+          prop: "plan_department.name",
+          width: 100,
+          align: "center",
+        },
+        {
+          label: "年份",
+          prop: "year",
+          width: 80,
+          align: "center",
+        },
+        {
+          label: "名称",
+          prop: "name",
+          width: 320,
+          align: "left",
+        },
+        {
+          label: "计划金额",
+          prop: "money",
+          align: "right",
+          width: 120,
+          customFn: (row) => {
+            let m1 = row.money;
+            let m2 = row.update_money;
+
+            return m2 == 0 ? m1 : m2;
           },
-          //获取购买方式
-          async getPurchaseWay() {
-            this.purchaseWay = (await getparameter({
-              number: 'purchase_way'
-            })).detail
+        },
+        {
+          label: "实付金额",
+          prop: "use_money_total",
+          width: 120,
+          align: "right",
+        },
+        {
+          label: "已用金额",
+          prop: "has_money_total",
+          width: 120,
+          align: "right",
+        },
+      ],
+
+      //新增
+      isShowAdd: false,
+      form: {
+        name: "",
+        is_contract: 1,
+        content: "",
+        is_simple: 0,
+        supply: "",
+        flow_mod_id: "",
+        money: 0,
+        type: "",
+        methods: "",
+        modality: "",
+        price: 0,
+        fundingChannels: [],
+        isBudget: true,
+        plan: [],
+        //is_substitute: 0,
+        is_framework: 0,
+        use_framework_buy: 0,
+        contract_to_contracts: [],
+      },
+      plan: [],
+      isShowPlan: false, //新增中预算计划
+      plans: [], //预算数据
+      planSearch: {
+        name: "",
+        plan_department_id: "",
+        year: ""
+      },
+      planTotal: 0,
+      plansPageIndex: 1,
+
+      //新增中框架合同
+      isShowContract: false,
+      isShowContractToContracts: false,
+      contractSelect: {
+        page: 1,
+        page_size: 10,
+        is_framework: 1,
+      },
+      contractTotal: 0,
+      contractList: [],
+      loading: false,
+      contractTable: [
+        {
+          type: "selection",
+          width: 56,
+          align: "center",
+        },
+        {
+          title: "项目名称",
+          key: "name",
+          minWidth: 180,
+          align: "left",
+        },
+        {
+          title: "采购形势",
+          width: 120,
+          render: (h, { row }) => {
+            return h("span", {}, row.purchase_type?.value || "无");
           },
-          //获取科室
-          async getDepartment() {
-            this.departments = await listdeptNoAuth()
+        },
+        {
+          title: "项目类型",
+          width: 120,
+          render: (h, { row }) => {
+            let map = new Map([
+              [1, "服务"],
+              [2, "货物"],
+              [3, "工程"],
+            ]);
+            return h("span", {}, map.get(row.type));
           },
-          //获取购买形式列表
-          async getPurchaseType() {
-            this.purchaseType = (await getparameter({
-              number: 'purchase_type'
-            })).detail
+        },
+        {
+          title: "采购方式",
+          width: 120,
+          render: (h, { row }) => {
+            return h("span", {}, row.purchase_way?.value || "无");
           },
-          pageSizeChange(e) {
+        },
+      ],
+      selections: [], //已选择的框架合同
+
+      isShowEditor: false,
+    };
+  },
+  methods: {
+    printFlow (row) {
+      let id;
+      if (row.purchase_last_flow_id) {
+        id = row.purchase_last_flow_id;
+      } else if (row.join_last_flow_id) {
+        id = row.join_last_flow_id
+      } else if (row.other_flow_id) {
+        id = row.other_flow_id
+      } else {}
+      if (!id) {
+        this.$message.warning("未找到流程");
+        return
+      }
+      window.open(`${process.env.VUE_APP_OUT_URL}/flow/print-relate-flow?id=${id}&except_self=0&auth_token=${this.$store.getters.oa_token}`,"_blank")
+    },
 
-            this.select.pageSize = e;
-            this.select.pageIndex = 1;
-            this.getContracts();
-          },
-          //获取合同列表
-          async getContracts() {
-
-            const res = await getContract({
-              page_size: this.select.pageSize,
-              page: this.select.pageIndex,
-              ...this.select
-            })
-
-            this.list = res.list.data
-            this.total = res.list.total
-            this.tableTotal.fundLogTotal = res.fund_log_total
-            this.tableTotal.moneyTotal = Number(res.money_total).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,')
-            this.tableTotal.planPriceTotal = Number(res.plan_price_total).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g,
-              '$1,')
-          },
+    showIsFramework () {
+      this.$nextTick(() => {
+        if (this.$refs['methodInput'].selected.label === '直接发包' && this.form.use_framework_buy) {
+          this.isShowIsFramework = false;
+          this.form.is_framework = true
+        } else {
+          this.isShowIsFramework = true;
+        }
+      })
+    },
+    async toOaDetail (tbname,row) {
+      let url = `${process.env.VUE_APP_OUT_URL}/#/flow/detail?auth_token=${window.encodeURIComponent(getToken())}&isSinglePage=1&flow_id=`
+      switch (tbname) {
+        case "caigou":
+          let caigou = row.is_common_purchase ? row.flow_list.find(i => i.tag === 'common_purchase') : row.flow_list.find(i => i.custom_model_id === row.flow_mod_id)
+          //url += `&to=/flow/detail?flow_id=${caigou.id}`
+          url += caigou?.flow_id
+          break;
+        case "hetong":
+          let contract = row.flow_list.find(i => i.tag === 'contract')
+          //url += `&to=/flow/detail?flow_id=${caigou.id}`
+          url += contract?.flow_id
+          break;
+        case "other":
+          url += row.other_flow_id
+          break;
+        default:
+          url = `${process.env.VUE_APP_OUT_URL}/flow/list/todo`
+      }
+      this.oaUrl = url
+      this.isShowOaModal = true
+    },
+    reset () {
+      this.select = deepCopy(this.selectCopy)
+    },
+    toExport() {
+      this.select.is_export = 1;
+      this.getContracts(true);
+    },
+    clearSelectForSearch() {
+      this.select.plan_id = "";
+      this.select.plan_name = "请选择预算计划";
+    },
+    async getPlanTypes() {
+      const res = await getparameter({
+        number: "money_way",
+      });
+      this.planTypes = res.detail;
+    },
 
+    //预算计划金额输入
+    planInput(e, row) {
+      if (!/^[0-9]+.?[0-9]*$/.test(e) && e) {
+        Message({
+          type: "warning",
+          message: "金额格式错误",
+        });
+        row.useMoney = 0;
+        return;
+      }
+      let money =
+        Number(row.update_money) == 0
+          ? Number(row.money)
+          : Number(row.update_money);
+      if (e <= money - Number(row.use_money_total)) {
+        row.useMoney = e;
+        this.plan.forEach((item) => {
+          if (item.value.plan_id == row.id) {
+            item.value.use_money = e;
+          }
+        });
+        return;
+      }
+      Message({
+        type: "warning",
+        message: "使用金额大于剩余预算",
+      });
+      row.useMoney = 0;
+    },
+    //合计
+    summary(param) {
+      this.$nextTick(() => {
+        this.$refs["xyTable"].$children[0].doLayout();
+      });
+      const { columns, data } = param;
+      const sums = [];
+      columns.map((column, index) => {
+        if (index === 0) {
+          sums[index] = "总计";
+          return;
+        }
+        if (column.property === "fund_log_total") {
+          sums[index] = this.tableTotal.fundLogTotal;
+          return;
+        }
+        if (column.property === "plan_price") {
+          sums[index] = this.tableTotal.planPriceTotal;
+          return;
+        }
+        if (column.property === "money") {
+          sums[index] = this.tableTotal.moneyTotal;
+          return;
+        }
+      });
 
-          //新建合同
-          //显示
-          async showPlan() {
-            this.isShowPlan = true
-            await this.getBudgets()
-            this.toggleSelection(this.form.plan.map(item => {
-              return item.value.plan_id
-            }))
-          },
-          async showPlanForSearch() {
-            this.isShowPlanForSearch = true
-            await this.getBudgets();
-          },
-          //选择计划 搜索
-          selectPlanForSearch(sel) {
-            console.log(sel)
-            if (sel) {
-              this.select.plan_id = sel.id;
-              this.select.plan_name = sel.name;
-            } else {
-              this.select.plan_id = "";
-              this.select.plan_name = "";
-            }
-          },
-          //选择计划
-          selectPlan(sel, row) {
-            console.log(sel)
-            if (sel) {
-              this.plan = sel.map(item => {
-                return {
-                  label: item.name,
-                  value: {
-                    plan_id: item.id,
-                    use_money: item.useMoney,
-                    new_money: item.money
-                  }
-                }
-              })
-            } else {
-              this.plan = []
-            }
-          },
-          //确认计划选择
-          planSelect() {
-            if (this.plan.length === 0) {
-              Message({
-                type: 'warning',
-                message: '选择计划不能为空'
-              })
-              return
-            }
-            for (let item of this.plan) {
-              console.log(item)
-              if (!item.value.use_money) {
-                Message({
-                  type: 'warning',
-                  message: '金额不能为空'
-                })
-                return
-              }
-            }
-            this.form.plan = this.plan
-            this.isShowPlan = false
-          },
+      return sums;
+    },
+    confirmPlanForSearch() {
+      this.isShowPlanForSearch = false;
+      this.getContracts();
+    },
 
-          //确认计划选择搜索
-          planSelectForSearch() {
-            if (this.select.plan_id == "") {
-              Message({
-                type: 'warning',
-                message: '选择计划不能为空'
-              })
-              return
-            }
-            this.isShowPlanForSearch = false
-          },
-          //默认选择计划
-          toggleSelection(plans) {
-            if (plans) {
-              this.plans.filter(plan => {
-                if (plans.includes(plan.id)) {
-                  plan.useMoney = this.form.plan[plans.indexOf(plan.id)].value.use_money
-                  return true
-                }
-              }).map(row => {
-                this.$refs.planTable.toggleRowSelection(row)
-              })
+    //
+    setNowContract(contract, tbname) {
+      this.nowContract = {
+        tbname,
+        ...contract,
+      };
+    },
+    //点击付款计划查看
+    showPaymentPlan(row, column, cell) {
+      if (column.property === "sign_plan_count") {
+        this.$refs["contractPaymentRegistration"].getSignPlan(row.id);
+        row.status === 2
+          ? (this.$refs["contractPaymentRegistration"].isSign = true)
+          : (this.$refs["contractPaymentRegistration"].isSign = false);
+        this.$refs["contractPaymentRegistration"].isShow = true;
+      }
+      if (column.property === "fund_log_total") {
+        this.$router.push(
+          `/contract/paymentRegistrationList?contractId=${row.id}`
+        );
+      }
+    },
+
+    //采购流程
+    async buyProcess(row,type=1) {
+      let baseInfo = {}
+      if (row.is_common_purchase) {
+        baseInfo = {
+          "caigoushuoming": row.name || "",
+          "caigouneirong": row.common_type,
+        }
+      }
+      switch (row.flow_mod_id) {
+        case 82:
+          baseInfo = {
+            "cankaojiage": row.plan_price,
+          }
+          break;
+        case 101:
+          baseInfo = {
+            "yujifeiyong": row.plan_price,
+          }
+          break;
+        case 29:
+        case 71:
+          baseInfo = {
+            "caigouxiangmuleixing": row.type_name,
+            "caigouxiangmu": row.name || "",
+            "caigoufangshi": this.purchaseWay.find(i => i.id === row.purchase_way_id)?.value || "",
+            "zijinlaiyuan": row?.plans.reduce((pre,cur,index)=>(index === 0 ? cur?.name : pre+cur?.name+"，"),"") || "",
+            "caigoujine": row.plan_price || "",
+            "caigouxiangmushuoming": row.content || "",
+            "zuzhixingshi": this.groupType.find(i => i.id === row.group_type)?.value || "",
+            "caigouxingshi": row.purchase_type.value
+          }
+          break;
+      }
+      let url = `${process.env.VUE_APP_OUT_OLD}/#/flow/create?auth_token=${window.encodeURIComponent(getToken())}&module_name=oa&isSinglePage=1&module_id=${row.is_common_purchase ? 99 : row.flow_mod_id}&out_contract_id=${row.id}&default_json=${JSON.stringify(baseInfo)}`;
+      console.log('url',url)
+      this.oaUrl = url
+      this.isShowOaModal = true
+    },
+    //会签流程
+    async signProcess(row) {
+      // 72
+      this.setNowContract(row, "hetong");
+      let baseInfo = {
+        "hetongmingcheng": row?.name,
+        "amt": Number(row?.money) || row?.plan_price,
+        out_contract_id: row.id,
+        "zhuyaoneirong": row.content,
+        "jiafang": row.supply,
+        "xiangguanliucheng": [row.flow_list?.find(i => i.custom_model_id === (row.is_common_purchase ? 99 : row.flow_mod_id))?.flow_id]
+      };
+      let url = `${process.env.VUE_APP_OUT_OLD}/#/flow/create?auth_token=${window.encodeURIComponent(getToken())}&module_name=oa&isSinglePage=1&module_id=72&out_contract_id=${row.id}&default_json=${JSON.stringify(baseInfo)}`;
+
+      this.oaUrl = url;
+      this.isShowOaModal = true;
+    },
+    //付款流程
+    async paying(row) {
+      // 75
+      let contract;
+      if (row.contract_id) {
+        contract = await detailContract({ id: row.contract_id });
+      } else {
+        contract = await show({ id: row.away_id });
+      }
+      let baseInfo = {
+        title: row?.name,
+        things: row?.name,
+        "contractno": row?.number,
+        out_pay_id: row?.out_pay_id,
+        "xiangxishuoming": row?.reason,
+        "cishu": row?.yizhifucishu,
+        "yifujine": row?.yizhifujine,
+        "xiangmuzonge": row?.zongjia,
+        "zhifucishu": row?.zhifucishu,
+        "amt": row?.applyMoney,
+        "liezhiqudao": contract?.plans.map(i => i.name)?.toString()
+      };
+      let url = `${process.env.VUE_APP_OUT_OLD}/#/flow/create?auth_token=${window.encodeURIComponent(getToken())}&module_name=oa&isSinglePage=1&module_id=75&out_away_id=${row.id}&default_json=${JSON.stringify(baseInfo)}`;
+
+      this.oaUrl = url;
+      this.isShowOaModal = true;
+      this.$router.push('/contract/paymentRegistrationList_1')
+    },
+    //请示流程
+    async askProcess(row) {
+      let res = await getOatoken();
+      let url = `${process.env.VUE_APP_OUT_URL}/admin/flow/create/17?auth_token=${this.$store.getters.oa_token}&out_contract_id=${row.id}`;
+      let askProcess = window.open(
+        url,
+        "askProcess",
+        `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
+      );
+    },
+
+    //翻页
+    pageChange(e) {
+      this.select.pageIndex = e;
+      this.getContracts();
+    },
+    planPageChange(e) {
+      this.plansPageIndex = e;
+      this.getBudgets();
+    },
+    //日期选择
+    datePick(e) {
+      this.select.start_created_at = e[0];
+      this.select.end_created_at = e[1];
+    },
+
+    //获取预算计划
+    async getBudgets() {
+      let res = await getBudget({
+        name: this.planSearch.name,
+        page_size: 10,
+        page: this.plansPageIndex,
+        plan_department_id: this.planSearch.plan_department_id,
+        top_pid: '',
+        is_tree: 1,
+        year: this.planSearch.year
+      });
+      this.plans = res.list;
+
+      this.planTotal = res.list.total || 0;
+
+      this.toggleSelection(
+        this.plan.map((item) => {
+          return item.value.plan_id;
+        }),
+        1
+      );
+    },
+    //事前流程
+    async getFlowIds () {
+      let copy = deepCopy(this.flowIds)
+      const res = await getparameter({
+        number: "flow_ids"
+      })
+      try {
+        this.flowIds = res?.detail?.filter(i => i.status)?.map(i => {
+          let data = JSON.parse(i.remark)
+          return {
+            name: i.value,
+            ...data
+          }
+        })
+      } catch (e) {
+        console.log(e)
+        this.flowIds = copy
+      }
+    },
+    //获取资金渠道
+    async getMoneyWay() {
+      try {
+        this.moneyWay = [];
+        const res = await getparameterTree({
+          id: 3
+        });
+        const dataHandler = (data) => {
+          data.forEach(i => {
+            if (i.hasOwnProperty('detail')) {
+              this.moneyWay.push(...i.detail)
             } else {
-              this.$refs.planTable.clearSelection()
+              dataHandler(i['children'])
             }
-          },
-          delPlan(val) {
-            this.form.plan.map((item, index) => {
-              if (item.value.plan_id === val.value.plan_id) {
-                this.form.plan.splice(index, 1)
-              }
-            })
-          },
-          //提交新建
-          submit() {
-            addContrant({
-              type: this.form.type,
-              is_plan: this.form.isBudget ? 1 : 0,
-              purchase_type_id: this.form.methods,
-              purchase_way_id: this.form.modality,
-              money_way_id: `${this.form.fundingChannels.toString()}`,
-              plan_price: this.form.price,
-              name: this.form.name,
-              contract_plan_links: this.form.plan.map(item => {
-                return item.value
-              })
-            }).then(res => {
-              this.isShowAdd = false
-              Message({
-                type: 'success',
-                message: '操作成功'
-              })
-              this.$refs['addContract'].reset()
-              this.$refs['planTable'].clearSelection()
-              this.getContracts()
-            })
-          },
+          })
+        }
+        dataHandler(res?.children)
+      } catch (err) {
 
-          //删除合同
-          deleteContract(id) {
-            delContract({
-              id
-            }).then(res => {
-              Message({
-                type: 'success',
-                message: '操作成功'
-              })
-              this.getContracts()
-            })
-          },
-          switchAssurance(id, status) {
-            let message = status == 1 ? "确认履约保函状态已收取?" : "确认履约保函状态未收取?";
-            this.$confirm(message, '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-
-              editorContract({
-                id: id,
-                assurance_status: status
-              }).then(res => {
-                Message({
-                  type: 'success',
-                  message: "操作成功"
-                })
-                this.getContracts();
-              })
-            }).catch(() => {
-              this.$message({
-                type: 'info',
-                message: '已取消操作'
-              });
-            });
+      }
+    },
+    //获取购买方式
+    async getPurchaseWay() {
+      this.purchaseWay = (
+        await getparameter({
+          number: "purchase_way",
+        })
+      ).detail;
+    }, //计划搜索
+    searchBudgets() {
+      this.plansPageIndex = 1;
+      this.getBudgets();
+    },
+    // 一般采购类型
+    async getCommonPurchaseType() {
+      try {
+        this.commonPurchaseTypes = (await getparameter({
+          number: 'common_purchase_type'
+        }))?.detail || []
+      } catch (err) {
+
+      }
+    },
+    //获取科室
+    async getDepartment() {
+      this.departments = (await listdeptNoAuth())?.data;
+    },
+    //组织形式
+    async getGroupType() {
+      this.groupType =
+        (
+          await getparameter({
+            number: "group_type",
+          })
+        )?.detail || [];
+    },
+    //获取购买形式列表
+    async getPurchaseType() {
+      this.purchaseType = (
+        await getparameter({
+          number: "purchase_type",
+        })
+      ).detail;
+    },
+    pageSizeChange(e) {
+      this.select.pageSize = e;
+      this.select.pageIndex = 1;
+      this.getContracts();
+    },
+    //获取合同列表
+    getContracts: throttle(async function (is_export,noloading=false,isopenOa=false) {
+      let tokens = getToken();
+      if (is_export && this.select.is_export === 1) {
+        var url = "/api/ht/contract/index?is_auth=1&token=" + tokens;
+        Object.keys(this.select).map((key, item) => {
+          url += "&" + key + "=" + this.select[key];
+        });
+        url = location.host + url;
+        console.log(url);
+        window.open("http://" + url, "_blank");
+        this.select.is_export = 0;
+        return;
+      }
+      if (/contractLedger/g.test(this.$route.path)) {
+        this.select.is_contract = 1
+      } else {
+        this.select.is_contract = ""
+      }
+      const res = await getContract({
+        page_size: this.select.pageSize,
+        page: this.select.pageIndex,
+        is_auth: 1,
+        ...this.select,
+      },noloading);
+      delete this.select.id;
+
+      res.list.data.forEach(i => this.handleContractFlow(i))
+      this.list = res.list.data;
+      console.log(this.list)
+      this.total = res.list.total;
+      this.tableTotal.fundLogTotal = res.fund_log_total;
+      this.tableTotal.moneyTotal = Number(res.money_total)
+        .toFixed(2)
+        .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
+      this.tableTotal.planPriceTotal = Number(res.plan_price_total)
+        .toFixed(2)
+        .replace(/(\d)(?=(\d{3})+\.)/g, "$1,");
+
+
+
+      //新增时打开oa采购录入
+      if (isopenOa) {
+        if (res.list.data[0]) {
+          if (
+            res.list.data[0].is_simple !== 1 &&
+            res.list.data[0].purchase_status === 1 &&
+            ((res.list.data[0].req_status === 3 && res.list.data[0].is_plan === 0) ||
+              res.list.data[0].is_plan === 1) &&
+            !res.list.data[0].is_substitute
+          ) {
 
           }
-        },
-        mounted() {
-          this.window.width = screen.availWidth * 0.95
-          this.window.height = screen.availHeight * 0.95
-          this.window.top = (window.screen.height - 30 - this.window.height) / 2
-          this.window.left = (window.screen.width - 10 - this.window.width) / 2
-          let that = this;
-          getInfo().then(response => {
-            console.log(response)
-            this.user = response;
-
-            if (that.userList.indexOf(response.username) != -1) {
-
-              that.hasEdit = true;
+          await this.buyProcess(res.list.data[0])
+        }
+      }
+    },1000),
+
+    //新建合同
+    async showPlanForSearch() {
+      this.isShowPlanForSearch = true;
+      await this.getBudgets();
+    },
+    //选择计划 搜索
+    selectPlanForSearch(sel) {
+      console.log(sel);
+      if (sel) {
+        this.select.plan_id = sel.id;
+        this.select.plan_name = sel.name;
+      } else {
+        this.select.plan_id = "";
+        this.select.plan_name = "";
+      }
+    },
+    //选择计划
+    selectPlan(sel, row) {
+      if (sel) {
+        let select = sel.map((item) => {
+          return {
+            label: item.name,
+            value: {
+              plan_id: item.id,
+              use_money: item.useMoney,
+              new_money: item.money,
+            },
+          };
+        });
+
+        //说明被删除了
+        if (
+          sel.filter((plan) => {
+            return plan.id == row.id;
+          }).length == 0
+        ) {
+          this.delPlan({
+            value: {
+              plan_id: row.id,
+            },
+          });
+        }
+        let _plan = JSON.parse(JSON.stringify(this.plan));
+
+        var _select = [];
+        select.map((item) => {
+          if (
+            _plan.filter((plan) => {
+              return plan.value.plan_id == item.value.plan_id;
+            }).length == 0
+          ) {
+            _select.push(item);
+          }
+        });
+
+        this.plan = [..._plan, ..._select];
+      } else {
+        this.plan = [];
+      }
+    },
+    //确认计划选择
+    planSelect() {
+      if (this.plan.length === 0) {
+        Message({
+          type: "warning",
+          message: "选择计划不能为空",
+        });
+        return;
+      }
+      for (let item of this.plan) {
+        console.log(item);
+        if (!item.value.use_money) {
+          Message({
+            type: "warning",
+            message: "金额不能为空",
+          });
+          return;
+        }
+      }
+      this.form.plan = this.plan;
+      this.isShowPlan = false;
+    },
+
+    delPlan(val) {
+      this.form.plan.map((item, index) => {
+        if (item.value.plan_id === val.value.plan_id) {
+          this.form.plan.splice(index, 1);
+        }
+      });
+      this.plan.map((item, index) => {
+        if (item.value.plan_id === val.value.plan_id) {
+          this.plan.splice(index, 1);
+        }
+      });
+    },
+    delSelections(val) {
+      this.selections.map((item, index) => {
+        if (item.id === val.id) {
+          this.selections.splice(index, 1);
+        }
+      });
+    },
+    //确认计划选择搜索
+    planSelectForSearch() {
+      if (this.select.plan_id == "") {
+        Message({
+          type: "warning",
+          message: "选择计划不能为空",
+        });
+        return;
+      }
+      this.isShowPlanForSearch = false;
+    },
+    //默认选择计划
+    toggleSelection(plans, type) {
+      if (plans) {
+        this.plans
+          .filter((plan) => {
+            if (plans.includes(plan.id)) {
+              plan.useMoney = this.plan[plans.indexOf(plan.id)].value.use_money;
+              return true;
             }
+          })
+          .map((row) => {
+            this.$refs.planTable.toggleRowSelection(row);
+          });
+      } else {
+        this.$refs.planTable.clearSelection();
+      }
+    },
+
+    //删除合同
+    deleteContract(id) {
+      delContract({
+        id,
+      }).then((res) => {
+        Message({
+          type: "success",
+          message: "操作成功",
+        });
+        this.getContracts();
+      });
+    },
+
+    //框架合同
+    async getContractToContracts() {
+      const res = await getContract(this.contractSelect);
+      let selectedIds = this.selections.map((i) => i.id);
+      this.contractList = res.list.data.map((item) => {
+        return {
+          ...item,
+          _checked: !!selectedIds.find((i) => i === item.id),
+        };
+      });
+      this.contractTotal = res.list.total;
+    },
+    selectionChange(selection) {
+      this.selections = Array.from(new Set(selection));
+    },
 
-          }).catch(error => {})
-          this.getPurchaseType()
-          this.getContracts()
-          this.getDepartment()
-          this.getPurchaseWay()
-          this.getMoneyWay()
-          //页面激活后刷新合同列表
-          window.onfocus = () => {
-            this.getContracts()
+    //数据流程状态处理
+    handleContractFlow (item) {
+      class Flow {
+        status = 0
+        executable = false
+        constructor(status=-2, executable=false) {
+          this.status = status
+          this.executable = executable
+        }
+        setStatus (status) {
+          this.status = status
+        }
+        setExecutable (executable) {
+          if (typeof executable === 'boolean') {
+            this.executable = executable
           }
-        },
-        destroyed() {
-          window.onfocus = null
+        }
+        getStatus () {
+          return this.status
+        }
+        isEnabled () {
+          return this.executable && (this.status === 2 || this.status === "")
+        }
+      }
+      //  [2, "待申请"],
+      //  [-1, "已退回"],
+      //  [-2, "-"],
+      //  [0, "流转中"],
+      //  [1, "已办结"]
+      let flowStatus = {
+        "caigou": new Flow(),
+        "zhaobiao": new Flow(),
+        "shenpi": new Flow(),
+        "qianding": new Flow(),
+        "zhifu": new Flow(),
+        "other": new Flow()
+      }
+      const common_purchase = item.flow_list.find(i => i.tag === 'common_purchase')
+      const caigou = item.flow_list.find(i => i.custom_model_id === item.flow_mod_id)
+      const shenpi = item.flow_list.find(i => i.tag === 'contract')
+      const other = item.flow_list.find(i => i.custom_model_id === item.flow_mod_id)
+      if (item.is_purchase) {
+        //为采购项目
+        if (!item.is_common_purchase) {
+          if (item.is_simple !== 1 && !item.is_substitute) {
+            //不为简易 采购未开始
+            flowStatus["caigou"].setStatus(caigou?.flow_status ?? 2)
+            if (!caigou) {
+              //采购未开始
+              if (item.is_plan === 1) {
+                flowStatus["caigou"].setExecutable(true)
+              }
+            }
+          }
+        } else {
+          flowStatus["caigou"].setStatus(common_purchase?.flow_status ?? 2)
+          if (!common_purchase || common_purchase.flow_status === 2) {
+            flowStatus["caigou"].setExecutable(true)
+          }
+        }
+        if (item.is_tender_audit) {
+          //不为网上商场 是合同\
+          flowStatus["zhaobiao"].setStatus(item.invite_status ?? 2)
+          if ((!item.invite_status || item.invite_status === 2)  && (caigou?.flow_status === 1 || common_purchase?.flow_status === 1)) {
+            //采购完成，招标未开始
+            flowStatus["zhaobiao"].setExecutable(true)
+          }
+        }
+        if (item.is_contract) {
+          //为合同 不为网上商城
+          flowStatus["shenpi"].setStatus(shenpi?.flow_status ?? 2)
+          if ((!shenpi?.flow_status || shenpi?.flow_status === 2) && ((item.is_tender_audit && item.invite_status === 1) || (!item.is_tender_audit && (caigou?.flow_status === 1 || common_purchase?.flow_status === 1)))) {
+            //审批未开始 走招标招标完成或不走招标采购完成
+            flowStatus["shenpi"].setExecutable(true)
+          }
+        }
+        if (item.is_contract) {
+          flowStatus["qianding"].setStatus(item.status)
+          if (shenpi?.flow_status === 1 && item.status === 1) {
+            flowStatus["qianding"].setExecutable(true)
+          }
+        }
+      } else {
+        if (item.flow_mod_id) {
+          //非采购事前流程
+          flowStatus["other"].setStatus(other?.flow_status ?? 2)
+          if (!other || other.flow_status === 2) {
+            flowStatus["other"].setExecutable(true)
+          }
+        }
+      }
+      if (item.is_end === 0) {
+        flowStatus["zhifu"].setStatus(2)
+        //最后一笔没付完
+        if (
+          (item.is_purchase === 0 && other?.flow_status === 1) ||
+          item.status === 2 ||
+          (!item.is_contract && item.is_simple) ||
+          (item.is_tender_audit && !item.is_contract && item.invite_status === 1) ||
+          (!item.is_tender_audit && !item.is_contract && (caigou?.flow_status === 1 || common_purchase?.flow_status === 1))
+        ) {
+          //网上商场的话采购完成 合同签订完成 不为合同并且为简易
+          flowStatus["zhifu"].setExecutable(true)
         }
       }
+
+      item.FLOWSTATUS = flowStatus
+    }
+  },
+  computed: {
+    purchaseWayFormat() {
+      return function () {
+        if (!this.form.methods) {
+          return this.purchaseWay;
+        } else {
+          let temp = this.purchaseType.find((i) => i.id === this.form.methods);
+          let arr = temp?.remark?.split(",")?.map((i) => Number(i));
+          return this.purchaseWay.filter((i) => arr.indexOf(i.id) !== -1);
+        }
+      };
+    },
+
+    otherFlowBtn () {
+      return function (flowModId) {
+        return this.flowIds.find(i => i.id === flowModId)?.name
+      }
+    }
+  },
+  watch: {
+    isShowContractToContracts(val) {
+      if (val) {
+        this.getContractToContracts();
+      } else {
+        this.contractSelect = {
+          page: 1,
+          page_size: 10,
+          is_framework: 1,
+        }
+        this.contractList = [];
+        this.contractTotal = 0;
+      }
+    },
+    isShowOaModal(newVal) {
+      if (newVal) {
+
+      } else {
+        this.oaUrl = ''
+      }
+    }
+  },
+  mounted() {
+    this.window.width = screen.availWidth * 0.95;
+    this.window.height = screen.availHeight * 0.95;
+    this.window.top = (window.screen.height - 30 - this.window.height) / 2;
+    this.window.left = (window.screen.width - 10 - this.window.width) / 2;
+    let that = this;
+    getInfo()
+      .then((response) => {
+        console.log(response);
+        this.user = response;
+
+        if (that.userList.indexOf(response.username) != -1) {
+          that.hasEdit = true;
+        }
+      })
+      .catch((error) => {});
+    this.select.is_myself = this.$route.path.split('_')[1] ? Number(this.$route.path.split('_')[1]) : 0
+    this.getContracts();
+    //页面激活后刷新合同列表
+    window.onfocus = async () => {
+      await this.getContracts(false,true)
+    };
+  },
+  created() {
+    this.getCommonPurchaseType();
+    this.getPurchaseType();
+    this.getDepartment();
+    this.getPurchaseWay();
+    this.getMoneyWay();
+    this.getGroupType();
+    this.getBudgets();
+    this.getFlowIds();
+    this.select.is_simple = 0;
+    this.select.id = this.$route.query.contractId || "";
+    this.select.keyword = this.$route.query.keyword || "";
+    this.select.is_myself = this.$route.path.split('_')[1] ? Number(this.$route.path.split('_')[1]) : 0;
+    if (/contractLedger/g.test(this.$route.path)) {
+      this.select.is_contract = 1;
+      // TODO: 搜索关联流程状态
+      /// this.select.purchase_status = 3;
+      this.select.invite_status = 3;
+      this.select["flow_link[0][custom_model_id]"] = 71;
+      this.select["flow_link[0][flow_status]"] = 1
+    }
+    if (/contractAll/g.test(this.$route.path)) {
+      this.select.is_simple = "";
+      this.select.is_purchase = 0;
+    }
+  },
+  destroyed() {
+    window.onfocus = null;
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-  .selects {
-    display: flex;
-    flex-wrap: wrap;
+.selects {
+  display: flex;
+  flex-wrap: wrap;
 
-    &>div {
-      margin-bottom: 6px;
-    }
+  & > div {
+    margin-bottom: 6px;
   }
-
-  .selectTop {
-    margin-top: 10px;
+}
+
+.selectTop {
+  margin-top: 10px;
+}
+
+.contract-add-plan {
+  min-height: 30px;
+  border: 1px solid #dcdee2;
+  border-radius: 4px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  align-content: center;
+
+  padding: 0 8px;
+
+  &-no-plan {
+    height: 30px;
+    line-height: 30px;
+    color: #cdd0d5;
   }
+}
 
-  .contract-add-plan {
-    min-height: 30px;
-    border: 1px solid #dcdee2;
-    border-radius: 4px;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    align-content: center;
-
-    padding: 0 8px;
-
-    &-no-plan {
-      height: 30px;
-      line-height: 30px;
-      color: #CDD0D5;
-    }
+.slot-btns {
+  display: flex;
+  flex-wrap: wrap;
+  align-content: center;
+  justify-content: flex-start;
+
+  &-item {
+    margin: 0 6px 4px 0;
   }
+}
 
+.xy-table-item-label {
+  width: 200px;
+}
 
-  .slot-btns {
-    display: flex;
-    flex-wrap: wrap;
-    align-content: center;
-    justify-content: flex-start;
+.xy-table-item-price {
+  position: relative;
 
-    &-item {
-      margin: 0 6px 4px 0;
-    }
+  &::after {
+    position: absolute;
+    right: 0;
+    top: 0;
+    content: "（元）";
   }
+}
 
-  .xy-table-item-label {
-    width: 140px;
-  }
+.select-content {
+  display: flex;
+  flex-wrap: wrap;
 
-  .xy-table-item-price {
-    position: relative;
+  & > div {
+    flex-basis: 45%;
 
-    &::after {
-      position: absolute;
-      right: 0;
-      top: 0;
-      content: '（元）'
+    margin: 5px;
+
+    & > span:nth-child(1) {
+      display: inline-block;
+      width: 140px;
     }
   }
+}
 
-  .select-content {
-    display: flex;
-    flex-wrap: wrap;
-
-    & > div {
-      flex-basis: 45%;
+a:hover {
+  transition: all .2s;
+  text-decoration: underline;
+}
+</style>
 
-      margin: 5px;
+<style lang="scss">
+.oa-modal {
 
-      & > span:nth-child(1) {
-        display: inline-block;
-        width: 140px;
-      }
-    }
+  .ivu-modal-body {
+    max-height: calc(100vh - 51px)!important;
+    padding: 0 !important;
+    overflow: hidden;
   }
+}
 </style>
diff --git a/src/views/finance/components/examineRegistration.vue b/src/views/finance/components/examineRegistration.vue
index 20a766f..73bed30 100644
--- a/src/views/finance/components/examineRegistration.vue
+++ b/src/views/finance/components/examineRegistration.vue
@@ -726,7 +726,7 @@ import {listdeptNoAuth} from "@/api/system/department";
       //获取科室
       getDepartment() {
         listdeptNoAuth().then((res) => {
-          this.departments = res;
+          this.departments = res.data;
         });
       },
     },
diff --git a/src/views/inOut/component/addExpenseAccount.vue b/src/views/inOut/component/addExpenseAccount.vue
index 15ea441..a03eb37 100644
--- a/src/views/inOut/component/addExpenseAccount.vue
+++ b/src/views/inOut/component/addExpenseAccount.vue
@@ -210,8 +210,9 @@
         <div style="display: flex; justify-content: flex-end">
           <Page
             :total="planTotal"
+            :page-size="planSearch.page_size"
             show-elevator
-            @on-change="e => {planSearch.p = e; getOutBudgets()}"
+            @on-change="e => {planSearch.page = e; getOutBudgets()}"
           />
         </div>
       </template>
@@ -233,6 +234,7 @@ import {
 } from "@/api/contract/contract";
 import { httpCurl } from "@/api/out"
 import { getBudget } from '@/api/budget/budget'
+import axios from "axios";
 export default {
   props: {
     report_types: {
@@ -264,9 +266,11 @@ export default {
       planTotal: 0,
       isShowPlan: false,
       planSearch: {
-        mod_name: '出差审批',
-        list_rows: 10,
-        p: 1
+        page: 1,
+        page_size: 20,
+        is_simple: 1,
+        is_auth: 1,
+        custom_model_id: 72
       },
       budgets: [],
       budgetTotal: 0,
@@ -303,10 +307,10 @@ export default {
         },
         {
           label: '创建时间',
-          prop: 'create_time',
+          prop: 'created_at',
           width: 180,
           formatter: (cell,data,value)=> {
-            return this.$moment(new Date(Number(value)*1000)).format('YYYY-MM-DD')
+            return value ? this.$moment(new Date(value)).format('YYYY-MM-DD') : ''
           }
         }
       ],
@@ -627,15 +631,25 @@ export default {
     },
     //获取预算计划
     async getOutBudgets() {
-      let res = await httpCurl(this.planSearch, false, '/Api/flowList');
-      this.plans = res.list
-      this.planTotal = Number(res.total)
-
-      this.plans.forEach(i => {
-        if (this.form.oa.find(oa => oa.id === i.id)) {
-          this.$refs['planTable'].toggleRowSelection(i)
-        }
+      let res = await axios.get(`${process.env.VUE_APP_BASE_API}/api/oa/flow/list/all`,{
+        headers: {
+          Authorization: `Bearer ${getToken()}`
+        },
+        params: this.planSearch
       })
+      if (res.status === 200) {
+        if (res.data.code) {
+          return
+        }
+        this.plans = res.data?.data?.data?.data
+        this.planTotal = Number(res.data?.data?.data?.total)
+
+        this.plans.forEach(i => {
+          if (this.form.oa.find(oa => oa.id === i.id)) {
+            this.$refs['planTable'].toggleRowSelection(i)
+          }
+        })
+      }
     },
 
   },
diff --git a/src/views/inOut/expenseAccount.vue b/src/views/inOut/expenseAccount.vue
index 1ca0e9e..f46a3ba 100644
--- a/src/views/inOut/expenseAccount.vue
+++ b/src/views/inOut/expenseAccount.vue
@@ -444,7 +444,7 @@ export default {
     },
 
     async getDepartment() {
-      this.departments = await listdeptNoAuth();
+      this.departments = (await listdeptNoAuth())?.data;
     },
 
     async getOtherType() {
diff --git a/src/views/inOut/incomeRegistration.vue b/src/views/inOut/incomeRegistration.vue
index 102be38..9a8fa69 100644
--- a/src/views/inOut/incomeRegistration.vue
+++ b/src/views/inOut/incomeRegistration.vue
@@ -362,7 +362,7 @@ export default {
     },
 
     async getDepartment() {
-      this.departments = await listdeptNoAuth();
+      this.departments = (await listdeptNoAuth())?.data;
     },
     async getList() {
       const res = await index(this.select);
diff --git a/src/views/statisticalReport/budgetProgress.vue b/src/views/statisticalReport/budgetProgress.vue
index 2f373a7..6909726 100644
--- a/src/views/statisticalReport/budgetProgress.vue
+++ b/src/views/statisticalReport/budgetProgress.vue
@@ -253,7 +253,7 @@
       //获取科室
       getDepartment() {
         listdeptNoAuth().then(res => {
-          this.departments = res
+          this.departments = res.data
         })
       },
 
diff --git a/src/views/system/worker.vue b/src/views/system/worker.vue
deleted file mode 100644
index 0f454de..0000000
--- a/src/views/system/worker.vue
+++ /dev/null
@@ -1,242 +0,0 @@
-<template>
-  <div style="padding: 0 10px 20px 10px">
-    <el-row :gutter="4">
-      <el-col :span="4">
-        <Card style="height: 100%;" :style="{'opacity':isDrag ? '0.4' : '1' }">
-          <template v-slot:title>
-            <p>组件</p>
-          </template>
-          <div
-            class="cpn-name__item"
-            :class="{ 'cpn-name__item--disable': statusFormat(item.i) }"
-            v-for="item in layout"
-            :draggable="!statusFormat(item.i)"
-            @dragstart="isDrag = true"
-            @dragend="dragEnd(item, $event)"
-          >
-            <i class="el-icon-folder-remove"></i>
-            <span>{{ item.name }}</span>
-            <Button
-              v-show="statusFormat(item.i)"
-              type="error"
-              size="small"
-              ghost
-              @click="removeLayout(item.i)"
-              >移除</Button
-            >
-          </div>
-        </Card>
-      </el-col>
-
-      <el-col :span="20">
-        <Card :class="{'drag-body':isDrag}">
-          <template v-slot:title>
-            <div style="display: flex;justify-content: space-between;align-items: center;">
-              <p>布局</p>
-              <Button type="primary" style="float: right;margin-right: 10px;" @click="sync">同步</Button>
-              <Button type="primary" style="float: right;" @click="save">保存</Button>
-            </div>
-          </template>
-
-          <grid-layout
-            id="grid-card"
-            class="gird-card"
-            :layout.sync="layoutList"
-            :col-num="12"
-            :row-height="40"
-            :is-draggable="true"
-            :is-resizable="true"
-            :is-mirrored="false"
-            :vertical-compact="true"
-            :margin="[10, 10]"
-            :autoSize="true"
-            :use-css-transforms="true"
-          >
-            <grid-item
-              v-for="item in layoutList"
-              :x="item.x"
-              :y="item.y"
-              :w="item.w"
-              :h="item.h"
-              :i="item.i"
-              :key="item.i"
-              style="touch-action: none"
-            >
-              <component
-                style="position: absolute; inset: 0 0 0 0;"
-                :is="item.component"
-              ></component>
-            </grid-item>
-          </grid-layout>
-        </Card>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import { save } from "@/api/system/expand"
-
-import VueGridLayout from "vue-grid-layout";
-import path from "path";
-const files = require.context(
-  "@/views/system/workerComponents",
-  false,
-  /.vue$/
-);
-let cpns = files.keys().map((key) => {
-  return files(key).default || files(key);
-});
-let layout = cpns.map((item) => {
-  return {
-    ...item.layout,
-    component: item,
-  };
-});
-export default {
-  components: {
-    "GridLayout": VueGridLayout.GridLayout,
-    "GridItem": VueGridLayout.GridItem
-  },
-  data() {
-    return {
-      layout,
-      layoutList: [],
-      isDrag: false,
-
-      grid: {
-        x: 0,
-        y: 0,
-      },
-    };
-  },
-  methods: {
-    dragEnd(item, e) {
-      this.isDrag = false
-      if (e.clientX >= this.grid.x && e.clientY >= this.grid.y) {
-        this.layoutList.push(item);
-      }
-    },
-
-    removeLayout(i) {
-      let temp = -1;
-      this.layoutList.forEach((item, index) => {
-        if (i === item.i) {
-          temp = index;
-        }
-      });
-      this.layoutList.splice(temp, 1);
-    },
-
-    async sync() {
-      await this.$store.dispatch("app/setLayout")
-
-      this.$store.dispatch('app/getLayout').then(res => {
-        this.layoutList = res.map(item => {
-          layout.forEach(lay => {
-            lay.i === item.i ? item.component = lay.component : ''
-          })
-          return item
-        })
-      })
-    },
-    save(){
-      let layout = this.layoutList.map(item => {
-        return {
-          x:item.x,
-          y:item.y,
-          w:item.w,
-          h:item.h,
-          i:item.i
-        }
-      })
-      this.$store.dispatch('app/saveLayout',layout)
-    }
-  },
-  computed: {
-    statusFormat() {
-      return function (i) {
-        let iArr = this.layoutList.map((item) => item.i);
-        return iArr.indexOf(i) !== -1;
-      };
-    },
-  },
-  mounted() {
-    this.grid = document.getElementById("grid-card").getBoundingClientRect();
-  },
-  created() {
-    this.$store.dispatch('app/getLayout').then(res => {
-      this.layoutList = res.map(item => {
-        layout.forEach(lay => {
-          lay.i === item.i ? item.component = lay.component : ''
-        })
-        return item
-      })
-    })
-  }
-};
-</script>
-
-<style scoped lang="scss">
-.gird-card {
-  min-height: 200px;
-}
-.cpn-name__item {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  color: rgb(100, 100, 100);
-  border-radius: 4px;
-  background-color: rgba(94, 181, 218, 0.3);
-  cursor: move;
-
-  padding: 6px 6px;
-  & > i {
-    padding-right: 6px;
-  }
-  & > span {
-    flex: 1;
-  }
-  & + div {
-    margin-top: 10px;
-  }
-
-  &--disable {
-    cursor: no-drop;
-    background-color: rgba(218, 94, 98, 0.3);
-  }
-}
-.drag-body{
-  transition: all .4s;
-  background: rgba(32, 160, 255, 0.3);
-  opacity: .7;
-}
-
-
-.fade-in {
-  animation: fade-in 800ms cubic-bezier(0.39, 0.575, 0.565, 1) both;
-}
-@keyframes fade-in {
-  0% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
-}
-.fade-out {
-  animation: fade-out 600ms ease-out both;
-}
-@keyframes fade-out {
-  0% {
-    opacity: 1;
-  }
-  100% {
-    opacity: 0;
-  }
-}
-
-::v-deep .el-card__header {
-  padding: 10px 20px;
-}
-</style>
diff --git a/src/views/system/workerComponents/book.vue b/src/views/system/workerComponents/book.vue
deleted file mode 100644
index 4d332b6..0000000
--- a/src/views/system/workerComponents/book.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<template>
-  <el-card class="box-card" shadow="hover">
-    <div slot="header" class="clearfix">
-      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="tushu"></SvgIcon>
-      <span style="padding-left: 15px"
-        >图书统计</span
-      >
-      <DatePicker
-        transfer
-        :value="select.date"
-        placeholder="选择所属年份"
-        placement="bottom"
-        style="width: 130px; margin-left: auto;"
-        type="month"
-        format
-        @on-change="changeMonth"
-      ></DatePicker>
-    </div>
-    <div class="progress-card">
-      <MyProgress width="213px" height="213px" :chart-data="chartData"></MyProgress>
-<!--      <div class="progress-card-item">-->
-<!--        <div class="progress-card-item__num">{{totalData.book.total}}</div>-->
-<!--        <div class="progress-card-item__label">总计</div>-->
-<!--      </div>-->
-<!--      <div class="progress-card-item">-->
-<!--        <div class="progress-card-item__num">{{totalData.book.no_return}}</div>-->
-<!--        <div class="progress-card-item__label">未归还</div>-->
-<!--      </div>-->
-<!--      <div class="progress-card-item">-->
-<!--        <div class="progress-card-item__num">{{totalData.book.rate+'%'}}</div>-->
-<!--        <div class="progress-card-item__label">{{(totalData.book.rate>0?'上升':(totalData.book.rate===0?'-':'下降'))}}</div>-->
-<!--      </div>-->
-    </div>
-  </el-card>
-</template>
-
-<script>
-import MyProgress from "@/components/Progress"
-import { httpCurl } from "@/api/out";
-import SvgIcon from "@/components/SvgIcon/index.vue";
-export default {
-  components: {
-    SvgIcon,
-    MyProgress
-  },
-  name: "card5",
-  layout: {
-    x: 0,
-    y: 0,
-    w: 4,
-    h: 5,
-    i: "6",
-    name: "图书统计",
-  },
-  data() {
-    return {
-      select: {
-        token: '',
-        date: this.$moment(new Date()).format('YYYY-MM'),
-      },
-      statistic: {
-        progress: {},
-      },
-      totalData: {
-        book: {
-          no_return: 0,
-          total: 0,
-          rate: 0
-        }
-      }
-    };
-  },
-  methods: {
-    changeMonth (e) {
-      this.date = e;
-      this.getStatic();
-    },
-    async getToken () {
-      if(/^\/system/.test(this.$route.path)) return
-      const token = await httpCurl({
-        auth_token: this.$store.getters.oa_token
-      },true,"","POST",`${process.env['VUE_APP_OUT_Book']}/api/admin/auth/oss-login`)
-      this.token = token.access_token
-    },
-    async getStatic() {
-      if(/^\/system/.test(this.$route.path)) return
-      const res = await httpCurl(
-        {
-          token: this.token,
-          date: this.date
-        },
-        true,
-        "",
-        "post",
-        `${process.env['VUE_APP_OUT_Book']}/api/admin/other/chart-total`
-      );
-      this.totalData = res;
-    },
-  },
-  computed: {
-    chartData () {
-      return [
-        {
-          name:'已归还',
-          value: this.totalData.book.total??0-this.totalData.book.no_return??0
-        },
-        {
-          name:'未归还',
-          value: this.totalData.book.no_return??0
-        }
-      ]
-    }
-  },
-  async created() {
-    await this.getToken();
-    await this.getStatic();
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.clearfix {
-  display: flex;
-  align-items: center;
-}
-.progress-card {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  &-item {
-    text-align: center;
-    flex: 1;
-
-    &__label {
-      font-size: 14px;
-    }
-
-    &__num {
-      font-size: 20px;
-      font-weight: 600;
-
-      padding: 6px 0;
-    }
-  }
-}
-</style>
diff --git a/src/views/system/workerComponents/bookBorrow.vue b/src/views/system/workerComponents/bookBorrow.vue
deleted file mode 100644
index 01d36c6..0000000
--- a/src/views/system/workerComponents/bookBorrow.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-  <el-card class="box-card" shadow="hover">
-    <div slot="header" class="clearfix">
-      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="book"></SvgIcon>
-      <span style="padding-left: 15px"
-        >图书借阅统计</span
-      >
-      <DatePicker
-        transfer
-        :value="select.date"
-        placeholder="选择所属年份"
-        placement="bottom"
-        style="width: 130px; margin-left: auto;"
-        type="month"
-        format
-        @on-change="changeMonth"
-      ></DatePicker>
-    </div>
-    <div class="progress-card">
-
-      <MyProgress class="progress-card-item" width="213px" height="213px" title="借出量" :percent="totalData.borrow.rate"></MyProgress>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import MyProgress from "@/components/Progress/index.vue";
-import SvgIcon from "@/components/SvgIcon/index.vue";
-import { httpCurl } from "@/api/out";
-export default {
-  components: {
-    SvgIcon,
-    MyProgress
-  },
-  name: "card6",
-  layout: {
-    x: 0,
-    y: 0,
-    w: 4,
-    h: 5,
-    i: "7",
-    name: "图书借阅统计",
-  },
-  data() {
-    return {
-      select: {
-        token: "",
-        date: this.$moment(new Date()).format("YYYY-MM"),
-      },
-      statistic: {
-        progress: {},
-      },
-      totalData: {
-        borrow: {
-          no_return: 0,
-          total: 0,
-          rate: 0,
-        },
-      },
-    };
-  },
-  methods: {
-    changeMonth(e) {
-      this.date = e;
-      this.getStatic();
-    },
-    async getToken() {
-      if (/^\/system/.test(this.$route.path)) return;
-      const token = await httpCurl(
-        {
-          auth_token: this.$store.getters.oa_token
-        },
-        true,
-        "",
-        "POST",
-        `${process.env["VUE_APP_OUT_Book"]}/api/admin/auth/oss-login`
-      );
-      this.token = token.access_token;
-    },
-    async getStatic() {
-      if (/^\/system/.test(this.$route.path)) return;
-      const res = await httpCurl(
-        {
-          token: this.token,
-          date: this.date,
-        },
-        true,
-        "",
-        "post",
-        `${process.env["VUE_APP_OUT_Book"]}/api/admin/other/chart-total`
-      );
-      console.log(res);
-      this.totalData = res;
-    },
-  },
-  computed: {},
-  async created() {
-    await this.getToken();
-    await this.getStatic();
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.progress-card {
-  display: flex;
-
-  &-item {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    text-align: center;
-    flex: 1;
-
-    &__label {
-      font-size: 14px;
-    }
-
-    &__num {
-      font-size: 20px;
-      font-weight: 600;
-
-      padding: 6px 0;
-    }
-  }
-}
-.clearfix {
-  display: flex;
-  align-items: center;
-}
-</style>
diff --git a/src/views/system/workerComponents/department.vue b/src/views/system/workerComponents/department.vue
deleted file mode 100644
index 7900c74..0000000
--- a/src/views/system/workerComponents/department.vue
+++ /dev/null
@@ -1,274 +0,0 @@
-<template>
-  <el-card class="box-card" shadow="hover" id="department-card">
-    <div slot="header" class="clearfix">
-      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="form"></SvgIcon>
-      <span style=" padding-left: 15px"
-        >科室执行情况</span
-      >
-      <i class="el-icon-more" style="margin-left: auto; font-size: 20px"></i>
-    </div>
-
-    <div style="position: relative;height: 100%;width: 100%;">
-      <div id="department-chart"></div>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import * as echarts from "echarts";
-import { moneyFormatter } from "@/utils";
-import ElementResize from 'element-resize-detector'
-import SvgIcon from "@/components/SvgIcon/index.vue";
-
-export default {
-  components: {
-    SvgIcon
-  },
-  name: "card3",
-  layout: {
-    x: 0,
-    y: 5,
-    w: 6,
-    h: 4,
-    i: "3",
-    name: "科室执行情况",
-  },
-  inject: {
-    getStatistic: {
-      default: () => {
-        return () => {
-          return {
-            statistic: {
-              departmentList: [
-                {
-                  money_total_1: "1900000.00",
-                  money_total_2: "0.00",
-                  ids: "11",
-                  plan_department_id: 2,
-                  use_money_total: 0,
-                  money_total: "0.00",
-                  end_money: 0,
-                  plan_department: {
-                    id: 2,
-                    pid: 0,
-                    name: "办公室（党建作风办）",
-                    manager_id: 7,
-                    leader_id: 4,
-                    sortnumber: 1,
-                    created_at: "2021-06-22 07:01:41",
-                    updated_at: "2023-03-22 14:56:51",
-                    deleted_at: null,
-                  },
-                },
-              ],
-            },
-          };
-        }
-      },
-    },
-  },
-  data() {
-    return {
-      chart: "",
-      tableHeight: 200,
-      table: [
-        {
-          title: "科室",
-          width: 100,
-          key: "plan_department.name",
-          fixed: "left",
-          render:(h,{row}) => {
-            return h('span',{},row.plan_department?.name)
-          }
-        },
-        {
-          title: "执行情况",
-          minWidth: 160,
-          fixed: "right",
-          render: (h, { row }) => {
-            let m2 = row?.money_total_2 || 0;
-            let m1 = row?.money_total_1 || 0;
-            let m3 = row?.use_money_total || 0;
-            let per = 0;
-
-            if (m2 != 0) {
-              per = ((m3 / m2) * 100).toFixed(2);
-            } else if (m1 != 0) {
-              per = ((m3 / m1) * 100).toFixed(2);
-            }
-            return h("el-progress", {
-              props: {
-                percentage: Number(per),
-              },
-            });
-          },
-        },
-        {
-          title: "年初预算合计金额(元)",
-          width: 170,
-          align: "right",
-          key: "money_total_1",
-          render: (h, { row }) => {
-            return h("span", {}, moneyFormatter(row.money_total_1));
-          },
-        },
-        {
-          title: "调整后预算合计金额(元)",
-          width: 170,
-          align: "right",
-          key: "money_total_2",
-          render: (h, { row }) => {
-            return h("span", {}, moneyFormatter(row.money_total_2));
-          },
-        },
-        {
-          title: "已使用(元)",
-          width: 120,
-          align: "right",
-          key: "use_money_total",
-          render: (h, { row }) => {
-            return h("span", {}, moneyFormatter(row.use_money_total));
-          },
-        },
-      ],
-    };
-  },
-  methods: {
-    setOptions() {
-      this.chart.setOption({
-        grid: {
-          left: "15%"
-        },
-        tooltip: {
-          show: true
-        },
-        legend: {
-          show: true
-        },
-        xAxis: {
-          data: this.departmentList.map((item) => item.plan_department.name),
-        },
-        yAxis: {
-          axisLabel: {
-            color: '#999'
-          }
-        },
-        series: [
-          {
-            barWidth: 30,
-            type: 'bar',
-            stack: "a",
-            name: "合计金额（元）",
-            itemStyle: {
-              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                { offset: 1, color: '#83bff6' },
-                { offset: 0.5, color: '#188df0' },
-                { offset: 0, color: '#188df0' }
-              ]),
-            },
-            emphasis: {
-              itemStyle: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  { offset: 1, color: '#4f86f5' },
-                  { offset: 0.3, color: '#3f79f1' },
-                  { offset: 0, color: '#3171f4' }
-                ])
-              }
-            },
-            data: this.departmentList.map(item => (parseFloat(item.money_total_2) ? parseFloat(item.money_total_2) : parseFloat(item.money_total_1) - parseFloat(item.use_money_total))),
-          },
-          {
-            barWidth: 30,
-            type: "bar",
-            stack: "a",
-            name: "已使用金额（元）",
-            label: {
-              show: true,
-              color: "#188df0",
-              position: "top",
-              formatter: (params) => {
-                console.log(params)
-                let m2 = this.departmentList[params.dataIndex]?.money_total_2 || 0;
-                let m1 = this.departmentList[params.dataIndex]?.money_total_1 || 0;
-                let m3 = this.departmentList[params.dataIndex]?.use_money_total || 0;
-                let per = 0;
-
-                if (m2 != 0) {
-                  per = ((m3 / m2) * 100).toFixed(2);
-                } else if (m1 != 0) {
-                  per = ((m3 / m1) * 100).toFixed(2);
-                }
-                return Number(per) + "%";
-              },
-            },
-            itemStyle: {
-              color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                { offset: 0, color: '#b4cef3' },
-                { offset: 0.5, color: '#aecbf5' },
-                { offset: 1, color: '#9fc4f9' }
-              ]),
-              borderRadius: [20, 20, 0, 0]
-            },
-            data: this.departmentList.map(item => parseFloat(item.use_money_total))
-          }
-        ]
-      })
-    },
-    init() {
-      this.chart = echarts.init(document.getElementById("department-chart"));
-      this.setOptions();
-      let cardDom = document.getElementById('department-card');
-      let cardTitleH = 58;
-      const elementResize = ElementResize({
-        strategy:'scroll'
-      })
-      elementResize.listenTo(cardDom,ele => {
-        //this.setOptions()
-        this.chart.resize();
-       // this.tableHeight = cardDom.getBoundingClientRect().height - 40 - cardTitleH
-      })
-    }
-  },
-  computed: {
-    departmentList() {
-      if (this.getStatistic)
-        return this.getStatistic()?.statistic?.departmentList || [];
-    },
-  },
-  watch: {
-    departmentList: {
-      handler: function (newVal) {
-        this.setOptions()
-      },
-      immediate: false
-    }
-  },
-  created() {},
-  mounted() {
-    this.init();
-  }
-};
-</script>
-
-<style scoped lang="scss">
-.clearfix {
-  display: flex;
-  align-items: center;
-}
-::v-deep .el-progress--line {
-  display: flex;
-  align-items: center;
-}
-::v-deep .el-progress__text {
-  word-break: keep-all;
-}
-::v-deep .el-card__body {
-  width: 100%;
-  height: calc(100% - 58px);
-}
-#department-chart {
-  width: 100%;
-  height: 100%;
-  min-height: 200px;
-}
-</style>
diff --git a/src/views/system/workerComponents/quickMenu.vue b/src/views/system/workerComponents/quickMenu.vue
deleted file mode 100644
index 34f600b..0000000
--- a/src/views/system/workerComponents/quickMenu.vue
+++ /dev/null
@@ -1,360 +0,0 @@
-<template>
-  <el-card class="box-card" shadow="hover">
-    <div slot="header" class="clearfix">
-      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="caidan"></SvgIcon>
-      <span style="padding-left: 15px">快捷菜单</span>
-      <Button v-if="/^\/system+/.test($route.path)" style="margin-left: auto;" size="small" type="primary" @click="isShow = true">新增菜单</Button>
-    </div>
-
-    <div class="menu-container">
-      <div v-for="(item, index) in myMenus" :key="item.id" class="menu-item" :class="`quick-btn${(index+1)%4}`">
-        <div style="display: flex;align-items: center;" @click="linkTo(item)">
-          <el-image v-if="item.image" style="max-width: 26px;margin-right: 6px;" fit="contain" :src="item.image ? item.image.url : ''">
-            <template #error>
-              <Icon type="ios-alert" />
-            </template>
-          </el-image>
-          {{ item.name }}
-        </div>
-
-        <div class="operate-btn" v-if="/^\/system+/.test($route.path)">
-          <Icon color="#4d8bdc" class="operate-btn__item" type="ios-create-outline" @click="editMenu(item)"/>
-          <Icon color="#4d8bdc" class="operate-btn__item" type="ios-trash-outline" @click="destroyMenu(item)"/>
-        </div>
-      </div>
-    </div>
-
-    <template v-if="/^\/system+/.test($route.path)">
-      <xy-dialog title="快捷菜单" type="form" :is-show.sync="isShow" :form="form" :rules="rule" @submit="submit">
-        <template #url>
-          <div class="xy-table-item">
-            <div class="xy-table-item-label">
-            <span style="color: red; font-weight: 600; padding-right: 4px"
-            >*</span
-            >菜单 ：
-            </div>
-            <div class="xy-table-item-content">
-              <el-cascader :value="form.url"
-                           :show-all-levels="false"
-                           ref="cascaderInput"
-                           :options="menus"
-                           style="width: 300px;"
-                           @change="cascaderPick"
-                           :props="{ label: 'name',value: 'path' }">
-              </el-cascader>
-            </div>
-          </div>
-        </template>
-        <template #name>
-          <div class="xy-table-item">
-            <div class="xy-table-item-label">
-            描述 ：
-            </div>
-            <div class="xy-table-item-content">
-              <el-input v-model="form.name" clearable style="width: 300px;">
-              </el-input>
-            </div>
-          </div>
-        </template>
-        <template #sort>
-          <div class="xy-table-item">
-            <div class="xy-table-item-label">
-              排序 ：
-            </div>
-            <div class="xy-table-item-content">
-              <el-input-number :controls="false" :precision="0" v-model="form.sort" clearable style="width: 300px;">
-              </el-input-number>
-            </div>
-          </div>
-        </template>
-        <template #status>
-          <div class="xy-table-item">
-            <div class="xy-table-item-label">
-              状态 ：
-            </div>
-            <div class="xy-table-item-content">
-              <el-switch style="width: 300px;" v-model="form.status" :inactive-value="0" :active-value="1" inactive-text="禁用" active-text="启用"></el-switch>
-            </div>
-          </div>
-        </template>
-        <template #method>
-          <div class="xy-table-item">
-            <div class="xy-table-item-label">
-              打开方式 ：
-            </div>
-            <div class="xy-table-item-content">
-              <el-select v-model="form.method" style="width: 300px;">
-                <el-option v-for="(item) in [{ label: '跳转',value: 'self' },{ label: '新页面',value: 'blank' }]" :value="item.value" :label="item.label">
-                </el-option>
-              </el-select>
-            </div>
-          </div>
-        </template>
-        <template #image_id>
-          <div class="xy-table-item">
-            <div class="xy-table-item-label">
-              图标 ：
-            </div>
-            <div class="xy-table-item-content">
-              <el-upload
-                style="width: 300px"
-                ref="upload"
-                :limit="1"
-                :on-success="successHandle"
-                :before-upload="uploadBefore"
-                accept=".jpg,.png,.gif"
-                :action="action"
-                :file-list="fileList"
-                :auto-upload="false"
-                :on-remove="removeHande"
-              >
-                <el-button slot="trigger" size="small" type="primary"
-                >选取文件</el-button
-                >
-                <el-button
-                  style="margin-left: 10px"
-                  size="small"
-                  type="success"
-                  @click="$refs['upload'].submit()"
-                >开始上传</el-button
-                >
-                <div slot="tip" class="el-upload__tip">
-                  支持文件格式： .jpg .png .gif
-                  <br />单个文件不能超过50M
-                </div>
-              </el-upload>
-            </div>
-          </div>
-        </template>
-      </xy-dialog>
-    </template>
-  </el-card>
-</template>
-
-<script>
-
-import { index, show, save, destroy } from "@/api/system/diyMenu";
-import { listmenu } from "@/api/system/menu";
-import { deepCopy } from '@/utils';
-import { getAuthMenu } from "@/api/me"
-import SvgIcon from "@/components/SvgIcon/index.vue";
-export default {
-  components: {
-    SvgIcon,
-  },
-  name: "card7",
-  layout: {
-    x: 0,
-    y: 0,
-    w: 4,
-    h: 5,
-    i: "8",
-    name: "快捷菜单",
-  },
-  data() {
-    return {
-      fileList: [],
-      action: process.env.VUE_APP_UPLOAD_API,
-      myMenus: [],
-      isShow: false,
-      menus: [],
-      form: {
-        url: "",
-        name: "",
-        sort: "",
-        status: "",
-        method: "",
-        image_id: "",
-        fileList: [],
-      },
-      rule: {
-        url: [
-          {
-            required: true,
-            message: "请选择菜单",
-          },
-        ]
-      }
-    }
-  },
-  methods: {
-    linkTo (item) {
-      if (item.method === 'self') {
-        this.$router.push(item.url)
-        return
-      }
-      if (item.method === 'blank') {
-        window.open(this.$router.resolve({
-          path: item.url
-        }).href,'_blank')
-      }
-    },
-    //上传
-    successHandle(response, file, fileList) {
-      this.fileList = fileList;
-    },
-    removeHande(file, fileList) {
-      this.fileList = fileList;
-    },
-    uploadBefore(file) {
-      console.log(file);
-      if (file.size / 1000 > 50 * 1024) {
-        this.$message({
-          type: "warning",
-          message: "上传图片大小超过50M！",
-        });
-        return false;
-      }
-    },
-
-    async getMenu () {
-      const formatMenu = (arr) => {
-        arr.forEach(item => {
-          if (item.children) {
-            item.children.length === 0 ? delete item.children : formatMenu(item.children)
-          }
-        })
-      }
-      this.menus = (await getAuthMenu())
-      formatMenu(this.menus)
-    },
-
-    async getDiymenu () {
-      this.myMenus = (await index({
-        page: 1,
-        page_size: 999,
-        sort_name: "sort"
-      },true)).data
-    },
-
-    cascaderPick (e) {
-      const pathHandler = (path) => {
-        if(!path || path?.includes('#') || path == ''){
-          return '/'
-        }
-        if(/^\^/.test(path)){
-          return path.replace(/^\^+/g,"")
-        }
-        if(/^\$/.test(path)){
-          return path.replace(/^\$+/g,"")
-        }
-        return path
-      }
-      this.form.url = pathHandler(e?.at(-1)) || ''
-
-      this.$nextTick(() => {
-        this.form.name = this.$refs['cascaderInput']?.presentText
-      })
-    },
-
-    async submit () {
-      this.form.image_id = this.fileList[0]?.response?.id
-      await save(this.form)
-      this.$message({
-        type: "success",
-        message: "保存成功"
-      })
-      await this.getDiymenu()
-      this.isShow = false;
-      this.form = {
-        url: "",
-        name: "",
-        sort: "",
-        status: "",
-        method: ""
-      }
-    },
-
-    destroyMenu (item) {
-      this.$confirm('确认要删除, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        destroy({
-          id: item.id
-        }).then(res => {
-          this.$message({
-            type: 'success',
-            message: '删除成功!'
-          });
-          this.getDiymenu()
-        })
-      })
-    },
-
-    async editMenu (item) {
-      const res = deepCopy(item)
-      this.form = Object.assign({
-        url: "",
-        name: "",
-        sort: "",
-        status: "",
-        method: ""
-      },res)
-      this.isShow = true;
-    }
-  },
-  computed: {
-  },
-  created() {
-    this.getMenu()
-    this.getDiymenu()
-  }
-}
-</script>
-
-<style scoped lang="scss">
-$colors: linear-gradient(90deg, #ffa175 0%, #fd635d 99%, #fd635d 100%),linear-gradient(90deg, #d38ff3 0%, #c359fb 99%, #c359fb 100%),linear-gradient(90deg, #ffb737 0%, #ff9f3b 100%),linear-gradient(90deg, #4bcbf1 0%, #3ba7ef 99%, #3ba7ef 100%), linear-gradient(to left, #b3ffab, #12fff7);
-$shadow: rgba(254,102,94,0.35),rgba(195,89,251,0.35),rgba(255,159,60,0.35),rgba(11,196,208,0.35),rgba(179,255,171,0.35);
-@for $index from 1 through length($colors) {
-  .quick-btn#{$index} {
-    filter: drop-shadow(1.462px 4.782px 10px  nth($shadow, $index));
-    background: nth($colors, $index);
-  }
-}
-.clearfix {
-  display: flex;
-  align-items: center;
-}
-::v-deep .el-input__inner {
-  text-align: left;
-}
-.xy-table-item-label {
-  width: 158px;
-}
-
-.menu-container {
-  display: flex;
-  flex-wrap: wrap;
-
-  .menu-item {
-    //background: $primaryColor;
-    color: #fff;
-    border-radius: 10px;
-    font-weight: 600;
-
-    padding: 14px 20px;
-    position: relative;
-    margin: 5px;
-
-    .operate-btn {
-      display: flex;
-
-      position: absolute;
-      top: -10px;
-      left: 8%;
-      &__item {
-        background: #fff;
-        zoom: .95;
-        border: 1px $primaryColor solid;
-        padding: 3px;
-        border-radius: 100%;
-        cursor: pointer;
-
-        margin-right: 8px;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/views/system/workerComponents/signStatic.vue b/src/views/system/workerComponents/signStatic.vue
deleted file mode 100644
index 5690ee1..0000000
--- a/src/views/system/workerComponents/signStatic.vue
+++ /dev/null
@@ -1,309 +0,0 @@
-<template>
-  <el-card class="box-card" shadow="hover">
-    <div slot="header" class="clearfix">
-      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="wengao"></SvgIcon>
-      <span style="padding-left: 15px"
-      >项目支出</span
-      >
-      <i class="el-icon-more" style="margin-left: auto; font-size: 20px"></i>
-    </div>
-
-    <div class="progress-card">
-      <div class="progress-card-item">
-        <div class="worker-progress__icon icon-yuan">
-          <SvgIcon icon-class="yuan"></SvgIcon>
-        </div>
-        <div class="progress-card-item__num">{{ moneyFormatter(statistic.progress.money_total_1 || 0) }}</div>
-        <div class="progress-card-item__label">年初预算合计金额</div>
-      </div>
-      <div class="progress-card-item">
-        <div class="worker-progress__icon icon-zhangdan">
-          <SvgIcon icon-class="zhangdan"></SvgIcon>
-        </div>
-        <div class="progress-card-item__num">{{ moneyFormatter(statistic.progress.money_total_2 || 0) }}</div>
-        <div class="progress-card-item__label">调整后预算合计金额</div>
-      </div>
-      <div class="progress-card-item">
-        <div class="worker-progress__icon icon-zhifu">
-          <SvgIcon icon-class="zhifu"></SvgIcon>
-        </div>
-        <div class="progress-card-item__num">{{moneyFormatter(statistic.progress.use_money_total || 0)}}</div>
-        <div class="progress-card-item__label">已支付金额</div>
-      </div>
-      <div class="progress-card-item">
-        <MyProgress width="145px" height="145px" title="执行率" :chart-data="[{value:statistic.progress.money_total_2 ? statistic.progress.money_total_2 : statistic.progress.money_total_1,name:'合计金额'},{value:statistic.progress.use_money_total,name:'已用金额'}]" ></MyProgress>
-      </div>
-    </div>
-
-    <Table style="margin-top: 20px;" :data="departments" size="small" :columns="table" :max-height="280"></Table>
-  </el-card>
-</template>
-
-<script>
-import ElementResize from "element-resize-detector";
-import { moneyFormatter } from "@/utils";
-import echarts from 'echarts'
-import SvgIcon from "@/components/SvgIcon/index.vue";
-import MyProgress from "@/components/Progress/index.vue";
-import {statistic} from "@/api/dashboard/notice";
-
-export default {
-  components: {
-    MyProgress,
-    SvgIcon
-  },
-  name: "card8",
-  layout: {
-    x: 0,
-    y: 5,
-    w: 6,
-    h: 4,
-    i: "9",
-    name: "项目支出",
-  },
-  inject: {
-    getStatistic: {
-      default: () => {
-        return () => {
-          return {
-            statistic: {
-              departmentList: [
-                {
-                  money_total_1: "1900000.00",
-                  money_total_2: "0.00",
-                  ids: "11",
-                  plan_department_id: 2,
-                  use_money_total: 0,
-                  money_total: "0.00",
-                  end_money: 0,
-                  plan_department: {
-                    id: 2,
-                    pid: 0,
-                    name: "办公室（党建作风办）",
-                    manager_id: 7,
-                    leader_id: 4,
-                    sortnumber: 1,
-                    created_at: "2021-06-22 07:01:41",
-                    updated_at: "2023-03-22 14:56:51",
-                    deleted_at: null,
-                  },
-                },
-              ],
-            },
-          };
-        }
-      },
-    },
-  },
-  data() {
-    return {
-      tableHeight: 200,
-      statistic: {
-        progress: {
-          money_total_1: 0,
-          money_total_2: 0,
-          use_money_total: 0
-        }
-      },
-      list: [],
-      table: [
-        {
-          title: "序号",
-          type: "index",
-          width: 60,
-          fixed: "left",
-          align: "center",
-        },
-        {
-          title: "部门",
-          key: "plan_department.name",
-          minWidth: 180,
-          align: "center",
-          fixed: "left",
-          render: (h, params) => {
-            return h("p",{ style: { "text-align": "left" } }, params.row.plan_department.name);
-          }
-        },
-        {
-          title: "年初预算数（元）",
-          key: "money_total_1",
-          align: "center",
-          width: 160,
-          render: (h, params) => {
-            return h("p",{ style: { "text-align": "right" } }, moneyFormatter(params.row.money_total_1));
-          }
-        },
-        {
-          title: "调整后预算数（元）",
-          key: "money_total_2",
-          align: "center",
-          width: 160,
-          render: (h, params) => {
-            return h("p",{ style: { "text-align": "right" } }, moneyFormatter(params.row.money_total_2));
-          }
-        },
-        {
-          title: "已使用（元）",
-          key: "money_total",
-          align: "center",
-          width: 140,
-          render: (h, params) => {
-            return h("p",{ style: { "text-align": "right" } }, moneyFormatter(params.row.money_total));
-          }
-        },
-        {
-          title: "进展情况",
-          key: "rate",
-          align: "center",
-          width: 160,
-          render: (h, row) => {
-            let m2 = row?.money_total_2 || 0;
-            let m1 = row?.money_total_1 || 0;
-            let m3 = row?.use_money_total || 0;
-            let per = 0;
-
-            if (m2 != 0) {
-              per = ((m3 / m2) * 100).toFixed(2);
-            } else if (m1 != 0) {
-              per = ((m3 / m1) * 100).toFixed(2);
-            }
-            return h("el-progress", {
-              props: {
-                percentage: Number(per),
-              },
-            });
-          }
-        },
-        {
-          title: "操作",
-          key: "action",
-          align: "center",
-          minWidth: 100,
-          render: (h, params) => {
-            return h("Button", {
-              props: {
-                size: "small"
-              }
-            } , "查看")
-          }
-        }
-      ]
-    };
-  },
-  methods: {
-    moneyFormatter,
-    init() {
-      let cardDom = this.$el;
-      let cardTitleH = 58;
-      const elementResize = ElementResize({
-        strategy:'scroll'
-      })
-      elementResize.listenTo(cardDom,ele => {
-        this.tableHeight = cardDom.getBoundingClientRect().height - 40 - cardTitleH
-      })
-    },
-    async getStatistics() {
-      if(/^\/system/.test(this.$route.path)) return
-
-      const res = await statistic(this.select,true)
-      this.statistic = res
-      this.$emit('send-data',res)
-    },
-  },
-  computed: {
-    departments () {
-      return this.getStatistics()?.statistic?.departmentList
-    }
-  },
-  created() {
-    this.getStatistic();
-  },
-  mounted() {
-    this.init();
-  }
-};
-</script>
-
-<style scoped lang="scss">
-.clearfix {
-  display: flex;
-  align-items: center;
-}
-::v-deep .el-card__body {
-  width: 100%;
-  height: calc(100% - 58px);
-}
-::v-deep .ivu-table th,::v-deep .ivu-table td {
-  border-bottom-style: dashed;
-}
-.progress-card {
-  display: grid;
-  grid-template-columns: repeat(4, 1fr);
-  grid-gap: 20px;
-
-  &-item {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    text-align: center;
-
-    &__label {
-      font-size: 15px;
-      color: #000000;
-      padding-top: 20px;
-    }
-
-    &__num {
-      font-size: 20px;
-      line-height: 7px;
-      color: #000000;
-      font-weight: bold;
-      padding-top: 18px;
-    }
-
-    .worker-progress__icon {
-      border-radius: 20px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 72px;
-      height: 72px;
-
-      svg {
-        border-radius: 100%;
-        width: 40px;
-        height: 40px;
-
-      }
-    }
-    .icon-yuan {
-      background: #56b7f9;
-      color: #fff;
-      filter: drop-shadow(0px 6px 6px rgba(43,188,255,0.5));
-      svg {
-        color: #56b7f9;
-        background: #fff;
-      }
-    }
-    .icon-zhangdan {
-      background: #446df6;
-      filter: drop-shadow(0px 6px 6px rgba(54,117,255,0.5));
-      svg {
-        color: #fff;
-        width: 36px;
-      }
-    }
-    .icon-zhifu {
-      background: #f2a93f;
-      filter: drop-shadow(0px 6px 6px rgba(255,164,45,0.5));
-      svg {
-        color: #fff;
-        width: 36px;
-      }
-    }
-  }
-}
-::v-deep .el-progress--circle .el-progress__text {
-  white-space: break-spaces;
-}
-</style>
diff --git a/src/views/system/workerComponents/toDo.vue b/src/views/system/workerComponents/toDo.vue
deleted file mode 100644
index ba78e4e..0000000
--- a/src/views/system/workerComponents/toDo.vue
+++ /dev/null
@@ -1,274 +0,0 @@
-<template>
-  <el-card class="box-card" shadow="hover" id="todo-card">
-    <div slot="header" class="clearfix">
-      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="notice"></SvgIcon>
-      <span style="padding-left: 15px"
-        >待办事项</span
-      >
-      <i class="el-icon-more" style="margin-left: auto; font-size: 20px"></i>
-    </div>
-
-    <div style="position: relative;height: 100%;width: 100%;">
-      <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-        <Table
-          :show-header="false"
-          :height="tableHeight"
-          :loading="loading"
-          size="small"
-          :data="/^\/system/.test(this.$route.path) ? example : list"
-          :columns="table"
-        ></Table>
-      </div>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import SvgIcon from "@/components/SvgIcon/index.vue";
-import { getNotice2, readNotice } from "@/api/dashboard/notice";
-import ElementResize from "element-resize-detector";
-
-export default {
-  components: {
-    SvgIcon
-  },
-  name: "card2",
-  layout: {
-    x: 4,
-    y: 0,
-    w: 6,
-    h: 4,
-    i: "2",
-    name: "待办事项",
-  },
-  data() {
-    return {
-      window: {
-        width: 0,
-        height: 0,
-        top: 0,
-        left: 0,
-      },
-      example: [
-        {
-          type: 1,
-          content: "示例1",
-          created_at: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-          read_count: true,
-        },
-        {
-          type: 2,
-          content: "示例2",
-          created_at: this.$moment().format("YYYY-MM-DD HH:mm:ss"),
-          read_count: false,
-        },
-      ],
-      select: {
-        page: 1,
-        page_size: 10,
-      },
-      tableHeight: 120,
-      loading: false,
-      list: [],
-      total: 0,
-      table: [
-        {
-          type: "index",
-          title: " ",
-          align: "center",
-          width: 46,
-        },
-        {
-          title: "收件时间",
-          key: "created_at",
-          width: 160,
-          align: "center",
-          render: (h, { row }) => {
-            return h("span",{ style: { color: "#4d8bdc" } }, this.$moment(row.created_at).format("YYYY-MM-DD HH:mm:ss"));
-          },
-        },
-        {
-          title: "内容",
-          key: "title",
-          align: "left",
-          ellipsis: true,
-          tooltip: true,
-          minWidth: 200,
-        },
-        {
-          title: "查看",
-          key: "show",
-          width: 180,
-          render: (h, { row }) => {
-            return h('div',[
-              h(
-                "Button",
-                {
-                  props: {
-                    type: "default",
-                    size: "small",
-                  },
-                  style: {
-                    background: "#f0f3fa",
-                    color: "#333",
-                    border: "1px solid #dae1f0",
-                    fontSize: "13px"
-                  },
-                  on: {
-                    ["click"]: (_) => {
-                      if(row.from_type === 'contract') {
-                        this.$router.push({
-                          path: '/contract/contract/contractList',
-                          query: {
-                            keyword:/\[(.*?)\]/.exec(row.title) ? /\[(.*?)\]/.exec(row.title)[1] : ''
-                          }
-                        })
-                      } else {
-                        window.open(
-                          `${process.env.VUE_APP_OUT_OLD}/flow/view/${row.id}?auth_token=${this.$store.getters.oa_token}`,
-                          "edit",
-                          `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
-                        );
-                      }
-                    },
-                  },
-                },
-                "查看"
-              ),
-              h(
-                "Button",
-                {
-                  props: {
-                    type: "primary",
-                    size: "small",
-                  },
-                  style: {
-                    "margin-left": "6px",
-                    fontSize: "13px"
-                  },
-                  on: {
-                    ["click"]: (_) => {
-                      if(row.from_type === 'contract') {
-                        this.$router.push({
-                          path: '/contract/contract/contractList',
-                          query: {
-                            keyword:/\[(.*?)\]/.exec(row.title) ? /\[(.*?)\]/.exec(row.title)[1] : ''
-                          }
-                        })
-                      } else {
-                        window.open(
-                          `${process.env.VUE_APP_OUT_OLD}/flow/deal/${row.id}?auth_token=${this.$store.getters.oa_token}`,
-                          "edit",
-                          `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
-                        );
-                      }
-                    },
-                  },
-                },
-                "办理"
-              )
-            ]);
-          },
-        },
-        // {
-        //   title: "状态",
-        //   key: "read_count",
-        //   width: 120,
-        //   render: (h, { row }) => {
-        //     return row.read_count
-        //       ? h(
-        //           "el-link",
-        //           {
-        //             props: {
-        //               type: "success",
-        //               underline: false,
-        //             },
-        //           },
-        //           "已读"
-        //         )
-        //       : h(
-        //           "Button",
-        //           {
-        //             props: {
-        //               type: "error",
-        //               size: "small",
-        //               ghost: true
-        //             },
-        //             on: {
-        //               ['click']:e => {
-        //                 if(/^\/system/.test(this.$route.path)) return
-        //
-        //                 readNotice({
-        //                   id: row.id
-        //                 }).then(res => {
-        //                   this.$message({
-        //                     type: 'success',
-        //                     message: '已读'
-        //                   })
-        //                   this.getNotices()
-        //                 })
-        //               }
-        //             }
-        //           },
-        //           "未读"
-        //         );
-        //   },
-        // },
-      ],
-    };
-  },
-  methods: {
-    async getNotices() {
-      if (/^\/system/.test(this.$route.path)) return;
-      try {
-        this.loading = true;
-        const res = await getNotice2(this.select, true);
-        this.list = res;
-        this.total = res.length;
-        this.loading = false;
-      } catch (e) {
-        this.loading = false;
-      }
-    },
-
-    init() {
-      let cardDom = document.getElementById("todo-card");
-      let cardTitleH = 58;
-      const elementResize = ElementResize({
-        strategy: "scroll",
-      });
-      elementResize.listenTo(cardDom, (ele) => {
-        this.tableHeight =
-          cardDom.getBoundingClientRect().height -
-          40 -
-          cardTitleH
-      });
-    },
-  },
-  computed: {},
-  created() {
-    this.window.width = screen.availWidth * 0.95;
-    this.window.height = screen.availHeight * 0.95;
-    this.window.top = (window.screen.height - 30 - this.window.height) / 2;
-    this.window.left = (window.screen.width - 10 - this.window.width) / 2;
-    this.getNotices();
-  },
-  mounted() {
-    this.init();
-  },
-};
-</script>
-
-<style scoped lang="scss">
-::v-deep .el-card__body {
-  width: 100%;
-  height: calc(100% - 58px);
-}
-::v-deep .ivu-table th,::v-deep .ivu-table td {
-  border-bottom-style: dashed;
-}
-.clearfix {
-  display: flex;
-  align-items: center;
-}
-</style>
diff --git a/src/views/system/workerComponents/total.vue b/src/views/system/workerComponents/total.vue
deleted file mode 100644
index d2c6d20..0000000
--- a/src/views/system/workerComponents/total.vue
+++ /dev/null
@@ -1,186 +0,0 @@
-<template>
-  <el-card class="box-card" shadow="hover">
-    <div slot="header" class="clearfix">
-      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="calendar-check"></SvgIcon>
-      <span style="padding-left: 15px;">预算总体执行情况</span>
-      <DatePicker transfer :value="select.year" placeholder="选择所属年份" placement="bottom" style="width: 130px;margin-left: auto;"
-                  type="year" @on-change="changeYear"></DatePicker>
-    </div>
-    <div class="progress-card">
-      <div class="progress-card-item">
-        <div class="worker-progress__icon icon-yuan">
-          <SvgIcon icon-class="yuan"></SvgIcon>
-        </div>
-        <div class="progress-card-item__num">{{moneyFormatter(statistic.progress.money_total_1 || 0)}}</div>
-        <div class="progress-card-item__label">年初预算合计金额</div>
-      </div>
-      <div class="progress-card-item">
-        <div class="worker-progress__icon icon-zhangdan">
-          <SvgIcon icon-class="zhangdan"></SvgIcon>
-        </div>
-        <div class="progress-card-item__num">{{moneyFormatter(statistic.progress.money_total_2 || 0)}}</div>
-        <div class="progress-card-item__label">调整后预算合计金额</div>
-      </div>
-      <div class="progress-card-item">
-        <div class="worker-progress__icon icon-zhifu">
-          <SvgIcon icon-class="zhifu"></SvgIcon>
-        </div>
-        <div class="progress-card-item__num">{{moneyFormatter(statistic.progress.use_money_total || 0)}}</div>
-        <div class="progress-card-item__label">已支付金额</div>
-      </div>
-      <div class="progress-card-item">
-        <MyProgress width="145px" height="145px" title="执行率" :chart-data="[{value:statistic.progress.money_total_2 ? statistic.progress.money_total_2 : statistic.progress.money_total_1,name:'合计金额'},{value:statistic.progress.use_money_total,name:'已用金额'}]" ></MyProgress>
-<!--        <el-progress :width="145" type="circle" stroke-width="20" :format="per => `${per}%\n执行率`" :percentage="40"></el-progress>-->
-<!--        <div class="progress-card-item__num">-->
-<!--          {{toper(statistic.progress.money_total_1 || 0,statistic.progress.money_total_2 || 0,statistic.progress.use_money_total || 0)}}%-->
-<!--        </div>-->
-<!--        <div class="progress-card-item__label">执行率</div>-->
-      </div>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import MyProgress from "@/components/Progress";
-import SvgIcon from "@/components/SvgIcon";
-import { moneyFormatter } from "@/utils"
-import { statistic } from '@/api/dashboard/notice'
-export default {
-  components: {
-    SvgIcon,
-    MyProgress
-  },
-  name:"card1",
-  layout:{
-    x:0,
-    y:0,
-    w:4,
-    h:5,
-    i:"1",
-    name:"预算统计",
-  },
-  data() {
-    return {
-      select: {
-        year: new Date().getFullYear().toString()
-      },
-      statistic: {
-        progress: {
-          money_total_1: 0,
-          money_total_2: 0,
-          use_money_total: 0
-        }
-      }
-    }
-  },
-  methods: {
-    moneyFormatter,
-    toper(m1, m2, m3) {
-      if (m2 != 0) {
-        return ((m3 / m2) * 100).toFixed(2);
-      } else if (m1 != 0) {
-        return ((m3 / m1) * 100).toFixed(2);
-      } else
-        return 0
-    },
-    changeYear(e) {
-      this.select.year = e;
-      this.getStatistic()
-    },
-    async getStatistic() {
-      if(/^\/system/.test(this.$route.path)) return
-
-      const res = await statistic(this.select,true)
-      this.statistic = res
-      this.$emit('send-data',res)
-    },
-  },
-  computed: {},
-  created() {
-    this.getStatistic();
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.clearfix {
-  display: flex;
-  align-items: center;
-}
-.progress-card {
-  display: grid;
-  grid-template-columns: repeat(4, 1fr);
-  grid-gap: 20px;
-
-  &-item {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    text-align: center;
-
-    &__label {
-      font-size: 15px;
-      color: #000000;
-      padding-top: 20px;
-    }
-
-    &__num {
-      font-size: 20px;
-      line-height: 7px;
-      color: #000000;
-      font-weight: bold;
-      padding-top: 18px;
-    }
-
-    .worker-progress__icon {
-      border-radius: 20px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 72px;
-      height: 72px;
-
-      svg {
-        border-radius: 100%;
-        width: 40px;
-        height: 40px;
-
-      }
-    }
-    .icon-yuan {
-      background: #56b7f9;
-      color: #fff;
-      filter: drop-shadow(0px 6px 6px rgba(43,188,255,0.5));
-      svg {
-        color: #56b7f9;
-        background: #fff;
-      }
-    }
-    .icon-zhangdan {
-      background: #446df6;
-      filter: drop-shadow(0px 6px 6px rgba(54,117,255,0.5));
-      svg {
-        color: #fff;
-        width: 36px;
-      }
-    }
-    .icon-zhifu {
-      background: #f2a93f;
-      filter: drop-shadow(0px 6px 6px rgba(255,164,45,0.5));
-      svg {
-        color: #fff;
-        width: 36px;
-      }
-    }
-  }
-}
-::v-deep .el-progress--circle .el-progress__text {
-  white-space: break-spaces;
-}
-</style>
-<style>
-.progress-card-item > .icon-yuan > svg > use {
-  transform: scale(0.55);
-  transform-origin: center;
-}
-</style>
diff --git a/src/views/system/workerComponents/type.vue b/src/views/system/workerComponents/type.vue
deleted file mode 100644
index e2f946f..0000000
--- a/src/views/system/workerComponents/type.vue
+++ /dev/null
@@ -1,305 +0,0 @@
-<template>
-  <el-card class="box-card" shadow="hover" id="type-card">
-    <div slot="header" class="clearfix">
-      <SvgIcon style="color: #3171f4;width: 22px;height: 22px;" icon-class="wengao"></SvgIcon>
-      <span style="padding-left: 15px"
-        >预算类型执行情况</span
-      >
-      <i class="el-icon-more" style="margin-left: auto; font-size: 20px"></i>
-    </div>
-
-    <div id="type-card-body" style="position: relative;height: 100%;width: 100%;">
-      <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
-        <Table style="width: 100%;" :height="tableHeight" size="small" :data="departmentList" :columns="table"></Table>
-      </div>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import ElementResize from "element-resize-detector";
-import { moneyFormatter } from "@/utils";
-import echarts from 'echarts'
-import SvgIcon from "@/components/SvgIcon/index.vue";
-
-export default {
-  components: {
-    SvgIcon
-  },
-  name: "card3",
-  layout: {
-    x: 0,
-    y: 5,
-    w: 6,
-    h: 4,
-    i: "5",
-    name: "预算类型执行情况",
-  },
-  inject: {
-    getStatistic: {
-      default: () => {
-        return () => {
-          return {
-            statistic: {
-              typeList: [
-                {
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "1150000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },{
-                  money_total_1: "17549700.00",
-                  money_total_2: "0.00",
-                  ids: "23,39,38,36,35,33,32,30,28,26,25,6,22,20,17,16,14,13,12,11,9,8",
-                  type: 7,
-                  use_money_total: "50000.00",
-                  type_text: "项目经费",
-                  money_total: "0.00",
-                  end_money: 0,
-                },
-              ],
-            },
-          };
-        };
-      },
-    },
-  },
-  data() {
-    return {
-      tableHeight: 200,
-      table: [
-        {
-          title: "预算类别",
-          width: 100,
-          key: "type_text",
-          ellipsis: true,
-          tooltip: true,
-          fixed: "left",
-        },
-        {
-          title: "执行情况",
-          minWidth: 120,
-          fixed: "right",
-          render: (h, { row }) => {
-            let m2 = row?.money_total_2 || 0;
-            let m1 = row?.money_total_1 || 0;
-            let m3 = row?.use_money_total || 0;
-            let per = 0;
-
-            if (m2 != 0) {
-              per = ((m3 / m2) * 100).toFixed(2);
-            } else if (m1 != 0) {
-              per = ((m3 / m1) * 100).toFixed(2);
-            }
-            return h("el-progress", {
-              props: {
-                "stroke-width": 13,
-                percentage: Number(per),
-              },
-            });
-          },
-        },
-        {
-          title: "年初预算合计金额(元)",
-          width: 170,
-          align: "right",
-          key: "money_total_1",
-          render: (h, { row }) => {
-            return h("span", {}, moneyFormatter(row.money_total_1));
-          },
-        },
-        {
-          title: "调整后预算合计金额(元)",
-          width: 170,
-          align: "right",
-          key: "money_total_2",
-          render: (h, { row }) => {
-            return h("span", {}, moneyFormatter(row.money_total_2));
-          },
-        },
-        {
-          title: "已使用(元)",
-          width: 120,
-          align: "right",
-          key: "use_money_total",
-          render: (h, { row }) => {
-            return h("span", {}, moneyFormatter(row.use_money_total));
-          },
-        },
-      ],
-    };
-  },
-  methods: {
-    init() {
-      let cardDom = document.getElementById('type-card');
-      let cardTitleH = 58;
-      const elementResize = ElementResize({
-        strategy:'scroll'
-      })
-      elementResize.listenTo(cardDom,ele => {
-        this.tableHeight = cardDom.getBoundingClientRect().height - 40 - cardTitleH
-      })
-    }
-  },
-  computed: {
-    departmentList() {
-      if (this.getStatistic)
-        return this.getStatistic()?.statistic?.typeList || [];
-    },
-  },
-  created() {},
-  mounted() {
-    this.init();
-  }
-};
-</script>
-
-<style scoped lang="scss">
-.clearfix {
-  display: flex;
-  align-items: center;
-}
-::v-deep .el-card__body {
-  width: 100%;
-  height: calc(100% - 58px);
-}
-::v-deep .ivu-table th,::v-deep .ivu-table td {
-  border-bottom-style: dashed;
-}
-::v-deep .el-progress {
-  white-space: nowrap;
-}
-::v-deep .el-progress__text {
-  color: rgb(77, 139, 220);
-}
-</style>