From 5f323a153bb745b499e0652b6f388746f312fb94 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Mon, 8 Jan 2024 11:58:05 +0800
Subject: [PATCH] 1

---
 .../contract/components/addContractLedger.vue |  4 +-
 .../contract/components/contractSign.vue      | 13 +++++
 .../components/detailPaymentRegistration.vue  |  6 +--
 .../contract/components/editorContract.vue    | 15 ++----
 .../components/examineRegistration.vue        |  2 +-
 .../components/paymentRegistration.vue        |  2 +-
 src/views/contract/contractList.vue           | 50 +++++++++++--------
 src/views/contract/seeContract.vue            |  2 +-
 .../components/examineRegistration.vue        |  2 +-
 .../inOut/component/addExpenseAccount.vue     |  2 +-
 10 files changed, 54 insertions(+), 44 deletions(-)

diff --git a/src/views/contract/components/addContractLedger.vue b/src/views/contract/components/addContractLedger.vue
index fd98f4d..27e090b 100644
--- a/src/views/contract/components/addContractLedger.vue
+++ b/src/views/contract/components/addContractLedger.vue
@@ -14,7 +14,7 @@
           <div class="xy-table-item">
             <div class="xy-table-item-label">
             <span style="color: red; font-weight: 600; padding-right: 4px"
-            >是否为合同</span
+            >是否需要签订合同</span
             >
             </div>
             <div class="xy-table-item-content">
@@ -240,7 +240,7 @@ export default {
         is_contract: 1,
         is_framework: "",
         purchase_status: 3,
-        join_status: 3,
+        //join_status: 3,
         invite_status: 3,
         files: []
       },
diff --git a/src/views/contract/components/contractSign.vue b/src/views/contract/components/contractSign.vue
index f4601ee..66ec3bf 100644
--- a/src/views/contract/components/contractSign.vue
+++ b/src/views/contract/components/contractSign.vue
@@ -30,6 +30,16 @@
           </div>
         </div>
       </template>
+      <template #content>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="width: 200px">
+            合同主要内容
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.content" style="width: 300px" type="textarea" :autosize="{ minRows: 2 }" placeholder="请输入合同主要内容"></el-input>
+          </div>
+        </div>
+      </template>
       <template v-slot:supply>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -248,6 +258,7 @@
         form: {
           is_contract: 1,
           number: '',
+          content: "",
           supply: '',
           carryDepartment: '',
           money: '',
@@ -443,6 +454,7 @@
         editorContract({
           id: this.contractId,
           number: this.form.number,
+          content: this.form.content,
           supply: this.form.supply,
           carry_department: this.form.carryDepartment,
           money: this.form.money,
@@ -530,6 +542,7 @@
         if (res.flow_detail.total) this.form.money = Number(res.flow_detail?.total)
         if (res.flow_detail.yifang) this.form.supply = res.flow_detail?.yifang
         if (res.flow.dept_name) this.form.carryDepartment = res.flow?.dept_name
+        if (res.flow_detail.contract_content) this.form.content = res.flow_detail.contract_content
       },
       //获取oa合同信息
       // async getOaContractInfo() {
diff --git a/src/views/contract/components/detailPaymentRegistration.vue b/src/views/contract/components/detailPaymentRegistration.vue
index 0ccca08..859533d 100644
--- a/src/views/contract/components/detailPaymentRegistration.vue
+++ b/src/views/contract/components/detailPaymentRegistration.vue
@@ -97,7 +97,7 @@
         <xy-table :list="plans" :show-index="false" :table-item="planTable" :height="310" style="margin-top: 10px;"
           ref="planTable" @select="selectPlan">
           <template v-slot:btns>
-            <el-table-column label="使用金额" header-align="center">
+            <el-table-column label="使用金额（元）" header-align="center">
               <template slot-scope="scope">
                 <Input :value="scope.row.use_money" @input="planInput($event,scope.row)" />
               </template>
@@ -259,10 +259,10 @@
         editorFundLog(this.form).then(res => {
           this.$emit('success')
           this.isShow = false
-          
+
           //付款申请后同时更新一下合同中审计金额
           editorContract({
-            id: this.form.contract_id, 
+            id: this.form.contract_id,
             audit_money: this.contract_form.audit_money
           }).then(r => {
             Message({
diff --git a/src/views/contract/components/editorContract.vue b/src/views/contract/components/editorContract.vue
index 0b6541b..89ad2e8 100644
--- a/src/views/contract/components/editorContract.vue
+++ b/src/views/contract/components/editorContract.vue
@@ -19,7 +19,7 @@
           <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 style="display: flex; width: 300px; align-items: center">
@@ -228,16 +228,6 @@
           </div>
         </div>
       </template>
-      <template #content>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="width: 200px">
-            合同主要内容
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="detail.content" style="width: 300px" type="textarea" :autosize="{ minRows: 2 }" placeholder="请输入合同主要内容"></el-input>
-          </div>
-        </div>
-      </template>
       <template v-slot:contract_to_contracts v-if="detail.use_framework_buy">
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -268,7 +258,7 @@
         <xy-table :list="plans" :show-index="false" :table-item="planTable" :height="310" style="margin-top: 10px;"
           ref="editorPlanTable" row-key="id" border default-expand-all :tree-props="{ children: 'notChildren', hasChildren: 'hasChildren' }" @select="selectPlan">
           <template v-slot:btns>
-            <el-table-column label="使用金额" header-align="center" width="130">
+            <el-table-column label="使用金额（元）" header-align="center" width="130">
               <template slot-scope="scope" v-if="scope.row.pid === 0">
                 <Input :value="scope.row.useMoney" @input="planInput($event,scope.row)" />
               </template>
@@ -762,6 +752,7 @@ import { resetSelect } from '@/utils'
           is_plan: this.detail.isBudget ? 1 : 0,
           is_simple:this.detail?.is_simple,
           content: this.detail?.content,
+          is_contract: this.detail?.is_contract,
           supply:this.detail?.supply,
           purchase_type_id: this.detail.methods,
           purchase_way_id: this.detail.modality,
diff --git a/src/views/contract/components/examineRegistration.vue b/src/views/contract/components/examineRegistration.vue
index f5f8e85..21250bb 100644
--- a/src/views/contract/components/examineRegistration.vue
+++ b/src/views/contract/components/examineRegistration.vue
@@ -113,7 +113,7 @@
         <Input search enter-button="搜 索" placeholder="搜索预算计划.." v-model="searchContent" @on-search="getBudgets"/>
         <xy-table :list="plans" :show-index="false" :table-item="planTable" :height="310" style="margin-top: 10px;" ref="planTable" @select="selectPlan">
           <template v-slot:btns>
-            <el-table-column label="使用金额" header-align="center">
+            <el-table-column label="使用金额（元）" header-align="center">
               <template slot-scope="scope">
                 <Input :value="scope.row.useMoney ? scope.row.useMoney: scope.row.money" @input="(e)=>scope.row.useMoney = e"/>
               </template>
diff --git a/src/views/contract/components/paymentRegistration.vue b/src/views/contract/components/paymentRegistration.vue
index a762d02..12e1b8e 100644
--- a/src/views/contract/components/paymentRegistration.vue
+++ b/src/views/contract/components/paymentRegistration.vue
@@ -248,7 +248,7 @@
           @select="selectPlan"
         >
           <template v-slot:btns>
-            <el-table-column label="使用金额" header-align="center">
+            <el-table-column label="使用金额（元）" header-align="center">
               <template slot-scope="scope">
                 <Input
                   :value="scope.row.useMoney"
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index ca4ada2..ad5fd07 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -303,10 +303,10 @@
         >
           <template slot-scope="scope">
             <div class="slot-btns">
-              <template v-if="scope.row.status === 2 && scope.row.is_end === 0">
-                <template v-if="scope.row.is_assurance == 1">
+              <template v-if="(scope.row.status === 2 && scope.row.is_end === 0) || (!scope.row.is_contract && scope.row.purchase_way && scope.row.purchase_way.value === '网上商城' && scope.row.purchase_status === 3)">
+                <template v-if="scope.row.is_assurance == 1 || (!scope.row.is_contract && scope.row.purchase_way && scope.row.purchase_way.value === '网上商城'  && scope.row.purchase_status === 3)">
                   <!-- 如果是 履约文件-->
-                  <template v-if="scope.row.assurance_status == 1">
+                  <template v-if="scope.row.assurance_status == 1 || (!scope.row.is_contract && scope.row.purchase_way && scope.row.purchase_way.value === '网上商城'  && scope.row.purchase_status === 3)">
                     <!-- 那么必须财务审核通过-->
                     <Button
                       class="slot-btns-item"
@@ -344,7 +344,7 @@
               </template>
 
               <template
-                v-if="(scope.row.status === 1 && scope.row.join_status === 3 && !/contractLedger/g.test($route.path)) || !(!scope.row.is_framework && scope.row.purchase_way && scope.row.purchase_way.value === '网上商城')"
+                v-if="(scope.row.status === 1 && scope.row.join_status === 3 && !/contractLedger/g.test($route.path)) && (scope.row.is_contract && scope.row.purchase_way && scope.row.purchase_way.value !== '网上商城')"
               >
                 <Button
                   class="slot-btns-item"
@@ -361,12 +361,12 @@
               <!--      采购完成        -->
               <template
                 v-if="
-                  scope.row.invite_status === 1 &&
+                  (scope.row.invite_status === 1 &&
                   scope.row.purchase_status === 3 &&
                   (scope.row.purchase_way
                     ? scope.row.purchase_way.remark === 'true'
                     : false) &&
-                  !scope.row.is_substitute
+                  !scope.row.is_substitute) && (scope.row.is_contract && scope.row.purchase_way && scope.row.purchase_way.value !== '网上商城')
                 "
               >
                 <Button
@@ -405,13 +405,13 @@
               <!--不需要走采购流程那么直接就是会签，如果采购方式不需要招标的也是直接会签-->
               <template
                 v-if="
-                  (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)
+                  (scope.row.is_substitute && scope.row.join_status === 1)) && (scope.row.is_contract && scope.row.purchase_way && scope.row.purchase_way.value !== '网上商城')
                 "
               >
                 <Button
@@ -569,7 +569,7 @@
           <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 style="display: flex; width: 300px; align-items: center">
@@ -682,9 +682,11 @@
           </div>
           <div class="xy-table-item-content">
             <el-select
+              ref="methodInput"
               v-model="form.methods"
               placeholder="请选择采购形式"
               style="width: 300px"
+              @change="showIsFramework"
             >
               <el-option
                 v-for="item in purchaseType"
@@ -786,7 +788,7 @@
           </div>
         </div>
       </template>
-      <template v-slot:is_framework>
+      <template v-slot:is_framework v-if="isShowIsFramework">
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="width: 200px">
             <span style="color: red; font-weight: 600; padding-right: 4px"
@@ -818,6 +820,7 @@
               inactive-text="否"
               :active-value="1"
               :inactive-value="0"
+              @change="showIsFramework"
             />
           </div>
         </div>
@@ -854,16 +857,6 @@
           </div>
         </div>
       </template>
-      <template #content>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="width: 200px">
-            合同主要内容
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="form.content" style="width: 300px" type="textarea" :autosize="{ minRows: 2 }" placeholder="请输入合同主要内容"></el-input>
-          </div>
-        </div>
-      </template>
       <template v-slot:plan>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -1004,7 +997,7 @@
           <template v-slot:btns>
             <el-table-column
               header-align="center"
-              label="使用金额"
+              label="使用金额（元）"
               fixed="right"
               width="140"
             >
@@ -1225,6 +1218,7 @@ export default {
     };
 
     return {
+      isShowIsFramework: true,
       userList: ["ma_sm", "admin", "yu_l","wang_yx","li_f","chen_y"],
       nowContract: {},
       window: {
@@ -1591,7 +1585,7 @@ export default {
               width: 158,
               prop: "purchase_status",
               customFn:row => {
-                if (row.is_substitute || row.is_simple || !row.is_contract) {
+                if (row.is_substitute || row.is_simple || (!row.is_contract && row.purchase_way?.value !== '网上商城')) {
                   return (<span>无</span>);
                 }
                 const getDate = (value) => {
@@ -2127,6 +2121,16 @@ export default {
     };
   },
   methods: {
+    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 res;
       switch (tbname) {
@@ -2460,6 +2464,7 @@ export default {
         total: row?.money || row?.plan_price,
         out_contract_id: row.id,
         contract_content: row.content,
+        yifang: row.supply
         //"承包商\\供应商":row.supply
       };
       //  let res = await getOatoken()
@@ -2771,6 +2776,7 @@ export default {
         type: this.form.type,
         is_plan: this.form.isBudget ? 1 : 0,
         purchase_type_id: this.form.methods,
+        is_contract: this.form.is_contract,
         purchase_way_id: this.form.modality,
         money_way_id: `${this.form.fundingChannels.toString()}`,
         plan_price: this.form.price,
diff --git a/src/views/contract/seeContract.vue b/src/views/contract/seeContract.vue
index 7b71c6b..9a0772b 100644
--- a/src/views/contract/seeContract.vue
+++ b/src/views/contract/seeContract.vue
@@ -352,7 +352,7 @@
         <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">
+            <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>
diff --git a/src/views/finance/components/examineRegistration.vue b/src/views/finance/components/examineRegistration.vue
index 1561081..74f21bc 100644
--- a/src/views/finance/components/examineRegistration.vue
+++ b/src/views/finance/components/examineRegistration.vue
@@ -185,7 +185,7 @@
         <xy-table :list="plans" :show-index="false" :table-item="planTable" :height="310" style="margin-top: 10px;"
           ref="planTable" @select="selectPlan">
           <template v-slot:btns>
-            <el-table-column label="使用金额" header-align="center" width="140">
+            <el-table-column label="使用金额（元）" header-align="center" width="140">
               <template slot-scope="scope">
                 <Input :value="scope.row.use_money" @input="inputMoney($event,scope.row)" />
               </template>
diff --git a/src/views/inOut/component/addExpenseAccount.vue b/src/views/inOut/component/addExpenseAccount.vue
index f8697aa..6dd2340 100644
--- a/src/views/inOut/component/addExpenseAccount.vue
+++ b/src/views/inOut/component/addExpenseAccount.vue
@@ -171,7 +171,7 @@
         <xy-table :list="budgets" :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">
+            <el-table-column label="使用金额（元）" header-align="center" width="140">
               <template slot-scope="scope">
                 <Input :value="scope.row.use_money" @input="inputMoney($event,scope.row)" />
               </template>