From 5603ad737dc023760bb8a3233bf1df041d8e16d6 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 16 Jan 2024 10:34:02 +0800
Subject: [PATCH] 1

---
 public/index.html                             |  2 +-
 .../contract/components/biddingUpload.vue     | 13 ++++++-------
 .../contract/components/editorContract.vue    | 10 +++++++---
 src/views/contract/contractList.vue           | 12 ++++++++----
 .../contract/paymentRegistrationList.vue      |  4 ++--
 .../inOut/component/addExpenseAccount.vue     | 19 +++++++++----------
 src/views/system/workerComponents/toDo.vue    | 12 ------------
 7 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/public/index.html b/public/index.html
index 105e794..4e0fc5b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
     <!--清除浏览器中的缓存 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <meta http-equiv="pragram" content="no-cache">
+    <meta http-equiv="pragma" content="no-cache">
     <meta http-equiv="cache-control" content="no-cache, no-store, must-revalidate">
     <meta http-equiv="expires" content="0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
diff --git a/src/views/contract/components/biddingUpload.vue b/src/views/contract/components/biddingUpload.vue
index 7a7228e..c17df83 100644
--- a/src/views/contract/components/biddingUpload.vue
+++ b/src/views/contract/components/biddingUpload.vue
@@ -12,7 +12,6 @@
         :file-list="fileList"
         :auto-upload="false"
         :on-remove="removeHande"
-        :limit="1"
       >
         <el-button slot="trigger" size="small" type="primary"
           >选取文件</el-button
@@ -77,15 +76,15 @@ export default {
         id: this.id,
       });
       this.detail = res;
-      this.fileList = res.tender ? [{
-        url: res.tender.url,
-        name: res.tender.original_name,
-        response: res.tender
-      }] : []
+      this.fileList = res.tender ? res.tender.map(i => ({
+        url: i.url,
+        name: i.original_name,
+        response: i
+      })) : []
     },
     submit() {
       this.detail.invite_status = 3;
-      this.detail.tender_id = this.fileList[0].response?.id;
+      this.detail.tender_id = this.fileList.map(i => i.response?.id)
       editorContract(this.detail).then((res) => {
         this.hide();
         this.$emit("refresh");
diff --git a/src/views/contract/components/editorContract.vue b/src/views/contract/components/editorContract.vue
index 89ad2e8..8f530a1 100644
--- a/src/views/contract/components/editorContract.vue
+++ b/src/views/contract/components/editorContract.vue
@@ -209,7 +209,7 @@
       <template v-slot:is_framework>
         <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>是否框架协议
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否新生成框架协议
           </div>
           <div class="xy-table-item-content">
             <el-switch v-model="detail.is_framework" active-text="是" inactive-text="否" :active-value="1"
@@ -220,7 +220,7 @@
       <template v-slot:use_framework_buy>
         <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>是否使用框架协议内的采购
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否使用框架协议采购内容
           </div>
           <div class="xy-table-item-content">
             <el-switch v-model="detail.use_framework_buy" active-text="是" inactive-text="否" :active-value="1"
@@ -822,7 +822,11 @@ import { resetSelect } from '@/utils'
         if(val){
           this.getContractToContracts();
         }else{
-          resetSelect(this.contractSelect);
+          this.contractSelect = {
+            page: 1,
+            page_size: 10,
+            is_framework: 1,
+          }
           this.contractList = [];
           this.contractTotal = 0;
         }
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index ad5fd07..222d3bd 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -793,7 +793,7 @@
           <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
@@ -811,7 +811,7 @@
           <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
@@ -1585,7 +1585,7 @@ export default {
               width: 158,
               prop: "purchase_status",
               customFn:row => {
-                if (row.is_substitute || row.is_simple || (!row.is_contract && row.purchase_way?.value !== '网上商城')) {
+                if (row.is_substitute || row.is_simple) {
                   return (<span>无</span>);
                 }
                 const getDate = (value) => {
@@ -2858,7 +2858,11 @@ export default {
       if (val) {
         this.getContractToContracts();
       } else {
-        resetSelect(this.contractSelect);
+        this.contractSelect = {
+          page: 1,
+          page_size: 10,
+          is_framework: 1,
+        }
         this.contractList = [];
         this.contractTotal = 0;
       }
diff --git a/src/views/contract/paymentRegistrationList.vue b/src/views/contract/paymentRegistrationList.vue
index 1e92018..f1c84cc 100644
--- a/src/views/contract/paymentRegistrationList.vue
+++ b/src/views/contract/paymentRegistrationList.vue
@@ -302,7 +302,7 @@ export default {
   methods: {
     async toOaDetail (row) {
       window.open(
-        `http://hjjc-szemcold-test.ali251.langye.net/index.php?s=/flow/edit/id/${row.flow_id}&auth_token=${this.$store.getters.oa_token}`,
+        `${process.env.VUE_APP_OUT_OLD}/index.php?s=/flow/edit/id/${row.flow_id}&auth_token=${this.$store.getters.oa_token}`,
         "bidding",
         `top=${this.window.top},left=${this.window.left},width=${this.window.width},height=${this.window.height},location=0`
       )
@@ -393,7 +393,7 @@ export default {
     },
 
     async getFundLogs() {
-      await fundlogFlow();
+      //await fundlogFlow();
       const res = await getFundLog({
         page_size: this.pageSize,
         page: this.pageIndex,
diff --git a/src/views/inOut/component/addExpenseAccount.vue b/src/views/inOut/component/addExpenseAccount.vue
index 6dd2340..a5a8396 100644
--- a/src/views/inOut/component/addExpenseAccount.vue
+++ b/src/views/inOut/component/addExpenseAccount.vue
@@ -168,7 +168,7 @@
             </template>
           </template>
         </div>
-        <xy-table :list="budgets" :show-index="false" :table-item="planTable" :height="310" style="margin-top: 10px;"
+        <xy-table :list="budgets" :tree-props="{ children: 'notChildren', hasChildren: 'hasChildren' }" :show-index="false" :table-item="planTable" :height="310" style="margin-top: 10px;"
                   ref="budgetTable" @select="selectPlan">
           <template v-slot:btns>
             <el-table-column label="使用金额（元）" header-align="center" width="140">
@@ -179,12 +179,12 @@
           </template>
         </xy-table>
 
-        <div style="display: flex;justify-content: flex-end;">
-          <Page :total="budgetTotal" show-elevator @on-change="e => {
-            budgetSelect.page = e;
-            getBudgets();
-          }" />
-        </div>
+<!--        <div style="display: flex;justify-content: flex-end;">-->
+<!--          <Page :total="budgetTotal" show-elevator @on-change="e => {-->
+<!--            budgetSelect.page = e;-->
+<!--            getBudgets();-->
+<!--          }" />-->
+<!--        </div>-->
       </template>
     </xy-dialog>
 
@@ -600,8 +600,7 @@ export default {
     },
     async getBudgets() {
       let res = await getBudget(this.budgetSelect)
-      this.budgets = res.list.data
-      this.budgetTotal = res.list.total
+      this.budgets = res.list
 
       this.toggleSelection(this.form.plan_link.map(item => {
         return item.plan_id
@@ -610,7 +609,7 @@ export default {
     //默认选择计划
     toggleSelection(plans) {
       if (plans) {
-        this.budgets.filter(plan => {
+        this.budgets?.filter(plan => {
           if (plans.includes(plan.id)) {
             plan.use_money = this.form.plan_link[plans.indexOf(plan.id)].use_money
             return true
diff --git a/src/views/system/workerComponents/toDo.vue b/src/views/system/workerComponents/toDo.vue
index 7dbabb4..e79d1be 100644
--- a/src/views/system/workerComponents/toDo.vue
+++ b/src/views/system/workerComponents/toDo.vue
@@ -88,18 +88,6 @@ export default {
           align: "center",
           width: 64,
         },
-        {
-          title: "类型",
-          align: "center",
-          width: 100,
-          render: (h, { row }) => {
-            let map = new Map([
-              ["szemcold", "审批流转"],
-              ["contract", "预算绩效"],
-            ]);
-            return h("span", {}, map.get(row.from_type));
-          },
-        },
         {
           title: "内容",
           key: "content",