From f4f9c05f9a56205e6df2c5f98870062d57f23dbb Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Thu, 18 Jan 2024 17:12:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E4=B8=BA?=
 =?UTF-8?q?=E6=B2=B3=E9=81=93=E5=A4=84=E6=94=B6=E8=B4=B9=E7=B1=BB=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=EF=BC=8C=E6=98=AF=E5=90=A6=E4=B8=BA=E5=BB=B6=E7=BB=AD?=
 =?UTF-8?q?=E7=B1=BB=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/components/contractSign.vue      | 14 +++++++++--
 .../contract/components/editorContract.vue    | 12 ++++++++++
 src/views/contract/contractList.vue           | 24 ++++++++++++++-----
 .../finance/components/addPropertyPlan.vue    |  2 +-
 4 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue
index 4aba715..4626353 100644
--- a/src/views/contract/components/contractSign.vue
+++ b/src/views/contract/components/contractSign.vue
@@ -104,6 +104,16 @@
           </div>
         </div>
       </template>
+      <template #has_continue>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="width: 200px;">
+            是否为延续类项目
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.has_continue" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0"/>
+          </div>
+        </div>
+      </template>
       <template v-slot:date>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -228,6 +238,7 @@
         form: {
           number: '',
           supply: '',
+          has_continue: 0,
           carryDepartment: '',
           money: '',
           time: [],
@@ -348,8 +359,6 @@
     methods: {
       //合同签订
       sign() {
-        console.log(this.signList)
-        console.log(this.signList.length)
         if (this.signList.length == 0) {
           Message({
             type: 'error',
@@ -362,6 +371,7 @@
           id: this.contractId,
           number: this.form.number,
           supply: this.form.supply,
+          has_continue: this.form.has_continue,
           carry_department: this.form.carryDepartment,
           money: this.form.money,
           status: 2,
diff --git a/src/views/contract/components/editorContract.vue b/src/views/contract/components/editorContract.vue
index e8327d3..549c670 100644
--- a/src/views/contract/components/editorContract.vue
+++ b/src/views/contract/components/editorContract.vue
@@ -36,6 +36,16 @@
           <div>（水电煤、报刊订阅、网络通讯、车辆使用等费用付款）</div>
         </div>
       </template>
+      <template #has_charge>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="width: 200px;">
+            是否为河道处收费类项目
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="detail.has_charge" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0"/>
+          </div>
+        </div>
+      </template>
       <template v-slot:supply v-if="detail.is_simple">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -632,6 +642,7 @@
         this.detail = {
           name: res.name,
           is_simple:res?.is_simple,
+          has_charge: res?.has_charge,
           date: res.date,
           req_status: res.req_status,
           purchase_status: res.purchase_status,
@@ -688,6 +699,7 @@
           type: this.detail.type,
           is_plan: this.detail.isBudget ? 1 : 0,
           is_simple:this.detail?.is_simple,
+          has_charge: this.detail?.has_charge,
           supply:this.detail?.supply,
           purchase_type_id: this.detail.methods,
           purchase_way_id: this.detail.modality,
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index afe209a..90e4fb6 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -188,19 +188,19 @@
                 <Button class="slot-btns-item" size="small" type="primary" @click="bidding(scope.row)">招标审查</Button>
               </template>
               <!--              <Button class="slot-btns-item" type="primary" size="small">附件管理</Button>-->
-              <template v-if="scope.row.req_status === 1 && scope.row.is_plan === 0 && !scope.row.is_substitute">
+              <template v-if="scope.row.req_status === 1 && (scope.row.is_plan === 0 && !scope.row.is_substitute || scope.row.has_charge)">
                 <Button class="slot-btns-item" size="small" type="primary" @click="askProcess(scope.row)">请示流程
                 </Button>
               </template>
               <!--不需要走采购流程那么直接就是会签，如果采购方式不需要招标的也是直接会签-->
               <template
-                v-if="(scope.row.join_status === 1 && ((scope.row.invite_status === 3)||((scope.row.purchase_way ? scope.row.purchase_way.remark === 'false' : false) && scope.row.purchase_status === 3)) || ( scope.row.is_substitute && scope.row.join_status === 1) ) ">
+                v-if="(scope.row.has_charge && scope.row.req_status === 3 && scope.row.join_status === 1) || (scope.row.join_status === 1 && ((scope.row.invite_status === 3)||((scope.row.purchase_way ? scope.row.purchase_way.remark === 'false' : false) && scope.row.purchase_status === 3)) || ( scope.row.is_substitute && scope.row.join_status === 1) ) ">
 
                 <Button class="slot-btns-item" size="small" type="primary" @click="signProcess(scope.row)">合同会签
                 </Button>
               </template>
               <template
-                v-if="scope.row.is_simple !== 1 && scope.row.purchase_status === 1 && ((scope.row.req_status === 3 && scope.row.is_plan === 0)||scope.row.is_plan === 1)&& !scope.row.is_substitute ">
+                v-if="!scope.row.has_charge && scope.row.is_simple !== 1 && scope.row.purchase_status === 1 && ((scope.row.req_status === 3 && scope.row.is_plan === 0)||scope.row.is_plan === 1)&& !scope.row.is_substitute ">
                 <Button class="slot-btns-item" size="small" type="primary" @click="buyProcess(scope.row)">采购流程
                 </Button>
               </template>
@@ -279,6 +279,16 @@
           <div>（水电煤、报刊订阅、网络通讯、车辆使用等费用付款）</div>
         </div>
       </template>
+      <template #has_charge>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="width: 200px;">
+            是否为河道处收费类项目
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.has_charge" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0"/>
+          </div>
+        </div>
+      </template>
       <template v-slot:supply v-if="form.is_simple">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -740,10 +750,10 @@ export default {
             width: 140,
             prop: 'req_status',
             formatter: (cell, data, value) => {
-              if (cell.is_substitute) {
+              if (cell.is_substitute && !cell.has_charge) {
                 return '无'
               }
-              if (cell.is_plan === 1) {
+              if (cell.is_plan === 1 && !cell.has_charge) {
                 return '无'
               }
               switch (value) {
@@ -1124,6 +1134,7 @@ export default {
       form: {
         name: "",
         is_simple:0,
+        has_charge: 0,
         supply: "",
         money:0,
         type: "",
@@ -1293,7 +1304,7 @@ export default {
                 columnIndex
               }) {
       if (column.property === 'req_status') {
-        if (row.is_plan || row.is_substitute || row.is_simple) {
+        if ((row.is_plan || row.is_substitute || row.is_simple) && !row.has_charge) {
           return {
             'color': 'rgb(140,140,140)'
           }
@@ -1748,6 +1759,7 @@ export default {
         }),
         is_substitute: this.form.is_substitute,
         is_simple:this.form.is_simple,
+        has_charge: this.form.has_charge,
         supply:this.form.supply,
         money:this.form?.money,
         status:this.form?.is_simple ? 2 : 1,
diff --git a/src/views/finance/components/addPropertyPlan.vue b/src/views/finance/components/addPropertyPlan.vue
index 62c8e97..90cae14 100644
--- a/src/views/finance/components/addPropertyPlan.vue
+++ b/src/views/finance/components/addPropertyPlan.vue
@@ -37,7 +37,7 @@
             <span style="color: red; font-weight: 600; padding-right: 4px"
               >*</span
             >
-            项目 ：
+            项目库选择 ：
           </div>
           <div class="xy-table-item-content">
             <el-input