From 11e8ee695777b4787378c85957d45ee8268b4035 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 26 Dec 2023 17:12:32 +0800
Subject: [PATCH] 2023-12-26

---
 .../contract/components/addContractLedger.vue | 13 +++++++++
 .../contract/components/editorContract.vue    | 12 ++++++++
 src/views/contract/contractList.vue           | 28 ++++++++++++++++++-
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/src/views/contract/components/addContractLedger.vue b/src/views/contract/components/addContractLedger.vue
index fee0a21..b8794c6 100644
--- a/src/views/contract/components/addContractLedger.vue
+++ b/src/views/contract/components/addContractLedger.vue
@@ -46,6 +46,18 @@
           </div>
         </div>
       </template>
+      <template #contract_type>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            合同类型
+          </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-select>
+          </div>
+        </div>
+      </template>
       <template v-slot:number>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -213,6 +225,7 @@ export default {
       time: [],
       form: {
         name: "",
+        contract_type: 1,
         number: "",
         supply: "",
         money: "",
diff --git a/src/views/contract/components/editorContract.vue b/src/views/contract/components/editorContract.vue
index bb6a6c2..0b6541b 100644
--- a/src/views/contract/components/editorContract.vue
+++ b/src/views/contract/components/editorContract.vue
@@ -228,6 +228,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="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">
@@ -707,6 +717,7 @@ import { resetSelect } from '@/utils'
         this.detail = {
           name: res.name,
           is_contract: res.is_contract,
+          content: res.content,
           is_simple:res?.is_simple,
           date: res.date,
           req_status: res.req_status,
@@ -750,6 +761,7 @@ import { resetSelect } from '@/utils'
           type: this.detail.type,
           is_plan: this.detail.isBudget ? 1 : 0,
           is_simple:this.detail?.is_simple,
+          content: this.detail?.content,
           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 96aba13..07334f1 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -344,7 +344,7 @@
               </template>
 
               <template
-                v-if="scope.row.status === 1 && scope.row.join_status === 3 && !/contractLedger/g.test($route.path)"
+                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 === '网上商场')"
               >
                 <Button
                   class="slot-btns-item"
@@ -854,6 +854,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:plan>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -1319,6 +1329,19 @@ export default {
           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)
+          }
+        },
         {
           label: "合同签订价(元)",
           width: 140,
@@ -1964,6 +1987,7 @@ export default {
       form: {
         name: "",
         is_contract: 1,
+        content: "",
         is_simple: 0,
         supply: "",
         money: 0,
@@ -2435,6 +2459,7 @@ export default {
         执行部门: row?.carry_department,
         total: row?.money || row?.plan_price,
         out_contract_id: row.id,
+        contract_content: row.content,
         //"承包商\\供应商":row.supply
       };
       //  let res = await getOatoken()
@@ -2760,6 +2785,7 @@ export default {
         status: this.form?.is_simple ? 2 : 1,
         is_framework: this.form?.is_framework,
         use_framework_buy: this.form.use_framework_buy,
+        content: this.form.content,
         contract_to_contracts: this.selections.map((i) => {
           return {
             to_contract_id: i.id,