From ad05dec9b4e79d131621aa9b4debd5715bea1ca5 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Wed, 5 Jun 2024 17:37:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/components/addContractLedger.vue |  2 +-
 .../contract/components/contractSign.vue      | 19 ++++++++++++-----
 .../contract/components/editorContract.vue    |  4 ++--
 .../contract/components/printRegistration.vue |  2 +-
 src/views/contract/contractEdit.vue           |  8 +++++--
 src/views/contract/contractLedger.vue         |  4 ++--
 src/views/contract/contractList.vue           | 21 +++++++++++++------
 7 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/src/views/contract/components/addContractLedger.vue b/src/views/contract/components/addContractLedger.vue
index 1cc6852..97cc171 100644
--- a/src/views/contract/components/addContractLedger.vue
+++ b/src/views/contract/components/addContractLedger.vue
@@ -53,7 +53,7 @@
           </div>
           <div class="xy-table-item-content">
             <el-select v-model="form.contract_type" style="width: 300px">
-              <el-option v-for="(item,index) in ['收入类','支出类','技术协议']" :label="item" :value="index+1"></el-option>
+              <el-option v-for="(item,index) in ['收入类','支出类','技术协议','其他协议']" :label="item" :value="index+1"></el-option>
             </el-select>
           </div>
         </div>
diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue
index 002a518..2ba1fd7 100644
--- a/src/views/contract/components/contractSign.vue
+++ b/src/views/contract/components/contractSign.vue
@@ -315,13 +315,13 @@
         contractId: null,
         contract: {},
         signList: [],
-        signTable: [{
-            prop: 'created_at',
-            label: '日期',
+        signTable: [
+          {
+            prop: "date",
+            label: "计划日期",
             width: 170,
-            sortable: false,
             formatter: (v1, v2, value) => {
-              return parseTime(new Date(value))
+              return this.$moment(new Date(value)).format("YYYY-MM-DD")
             }
           },
           {
@@ -347,6 +347,15 @@
             minWidth: 180,
             align: 'left',
             sortable: false,
+          },
+          {
+            prop: 'created_at',
+            label: '日期',
+            width: 170,
+            sortable: false,
+            formatter: (v1, v2, value) => {
+              return this.$moment(new Date(value)).format("YYYY-MM-DD HH:mm:ss")
+            }
           }
         ],
 
diff --git a/src/views/contract/components/editorContract.vue b/src/views/contract/components/editorContract.vue
index 81b2bd1..8bddba8 100644
--- a/src/views/contract/components/editorContract.vue
+++ b/src/views/contract/components/editorContract.vue
@@ -50,10 +50,10 @@
       <template v-slot:supply v-if="detail.is_simple">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;font-size: 11px;">*</span>承包商/供货商
+            <span style="color: red;font-weight: 600;padding-right: 4px;font-size: 11px;">*</span>承包商/供货商/协议方
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="detail.supply" placeholder="请填写承包商/供货商" style="width: 300px;"/>
+            <el-input v-model="detail.supply" placeholder="请填写承包商/供货商/协议方" style="width: 300px;"/>
           </div>
         </div>
       </template>
diff --git a/src/views/contract/components/printRegistration.vue b/src/views/contract/components/printRegistration.vue
index 0c06836..43ba2fc 100644
--- a/src/views/contract/components/printRegistration.vue
+++ b/src/views/contract/components/printRegistration.vue
@@ -12,7 +12,7 @@
               <div>本次为第 <span style="font-weight: 600;padding: 0 1vw;">{{payIndex}}</span> 次付款</div>
               <div>{{registration.remark}}</div>
             </div>
-            <div style="grid-area: tb2-1" class="print-table1-grid-top">承包商/供货商：<span
+            <div style="grid-area: tb2-1" class="print-table1-grid-top">承包商/供货商/协议方：<span
                 style="font-weight: 600">{{registration.contract.supply}}</span></div>
             <div style="grid-area: tb2-2" class="print-table1-grid-top">合同服务时间：<span
                 style="font-weight: 600">{{registration.contract.start_date}} -
diff --git a/src/views/contract/contractEdit.vue b/src/views/contract/contractEdit.vue
index b701853..e4cd731 100644
--- a/src/views/contract/contractEdit.vue
+++ b/src/views/contract/contractEdit.vue
@@ -197,10 +197,10 @@
             </el-form-item>
 
             <template v-if="form.is_simple">
-              <el-form-item prop="supply" label="承包商/供货商">
+              <el-form-item prop="supply" label="承包商/供货商/协议方">
                 <el-input
                   v-model="form.supply"
-                  placeholder="请填写承包商/供货商"
+                  placeholder="请填写承包商/供货商/协议方"
                   style="width: 100%"
                 />
               </el-form-item>
@@ -1333,6 +1333,10 @@ export default {
             } else {
               this.form.contract_plan_links = []
             }
+            if (this.form.is_contract && this.form.is_simple) {
+              this.form.purchase_status = 3;
+              this.form.invite_status = 3;
+            }
             if (this.type === 'add') {
               addContrant(this.form,true).then(res => {
                 this.btnLoading = false
diff --git a/src/views/contract/contractLedger.vue b/src/views/contract/contractLedger.vue
index e6a838b..07325e3 100644
--- a/src/views/contract/contractLedger.vue
+++ b/src/views/contract/contractLedger.vue
@@ -501,12 +501,12 @@
                 font-size: 11px;
               "
               >*</span
-            >承包商/供货商
+            >承包商/供货商/协议方
           </div>
           <div class="xy-table-item-content">
             <el-input
               v-model="form.supply"
-              placeholder="请填写承包商/供货商"
+              placeholder="请填写承包商/供货商/协议方"
               style="width: 300px"
             />
           </div>
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index fa2731a..f457e4c 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -288,7 +288,7 @@
       @delete="(row) => deleteContract(row.id)"
       @editor=""
     >
-      <template v-slot:btns v-if="!/contractLedger/g.test($route.path)">
+      <template v-slot:btns v-if="!/contractLedger$/g.test($route.path)">
         <el-table-column
           fixed="right"
           header-align="center"
@@ -297,7 +297,7 @@
         >
           <template slot-scope="scope">
             <div class="slot-btns">
-              <template v-if="scope.row.FLOWSTATUS['zhifu'].isEnabled()">
+              <template v-if="scope.row.FLOWSTATUS['zhifu'].isEnabled() && !/contractLedger/g.test($route.path)">
                 <template v-if="scope.row.is_assurance === 1">
                   <!-- 如果是 履约文件-->
                   <template v-if="scope.row.assurance_status === 1">
@@ -511,7 +511,7 @@
                         scope.row.invite_status != 1 ||
                         scope.row.purchase_status != 1 ||
                         scope.row.status === 2
-                      ) || (scope.row.is_substitute && scope.row.join_status === 1)
+                      )
                     "
                   >
                     <Poptip
@@ -681,7 +681,7 @@
                 font-size: 11px;
               "
               >*</span
-            >承包商/供货商
+            >承包商/供货商/协议方
           </div>
           <div class="xy-table-item-content">
             <el-input
@@ -1141,7 +1141,7 @@
 
     <oaFiles ref="oaFiles"></oaFiles>
 
-    <addContractLedger ref="addContractLedger" @refresh="getContracts"></addContractLedger>
+    <addContractLedger ref="addContractLedger" @refresh="getContracts(false,false,true)"></addContractLedger>
   </div>
 </template>
 
@@ -1383,7 +1383,8 @@ export default {
             let map = new Map([
               [1,'收入类'],
               [2,'支出类'],
-              [3,'技术协议']
+              [3,'技术协议'],
+              [4,'其他协议']
             ])
             return map.get(value)
           }
@@ -2486,6 +2487,9 @@ export default {
           ) {
             await this.buyProcess(res.list.data[0])
           }
+          if (res.list.data[0].is_simple !== 1 && res.list.data[0].is_substitute ) {
+            await this.signProcess(res.list.data[0])
+          }
         }
       }
     },
@@ -2839,10 +2843,15 @@ export default {
       this.select.is_contract = 1;
       this.select.purchase_status = 3;
       this.select.invite_status = 3;
+      this.select.is_simple = "";
     }
     if (/contractAll/g.test(this.$route.path)) {
       this.select.is_simple = "";
     }
+    if (/contractList/g.test(this.$route.path)) {
+      this.select.is_substitute = 0;//is_substitute 用于是否有采购流程，1为合同台账中增加（没有流程）
+      //this.select.contract_type = 2;
+    }
   },
   destroyed() {
     window.onfocus = null;