2023-12-18

src/views/contract/components/editorContract.vue

@@ -14,6 +14,18 @@
           </div>
         </div>
       </template>
+      <template #contract_carry_department>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            执行科室
+          </div>
+          <div class="xy-table-item-content">
+            <el-select multiple v-model="detail.contract_carry_department" placeholder="请选择责任科室" style="width: 300px;">
+              <el-option v-for="item in departments" :value="item.id" :label="item.name"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
       <template v-slot:is_simple>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -257,7 +269,8 @@
     props: {
       purchaseType: Array,
       moneyWay: Array,
-      purchaseWay: Array
+      purchaseWay: Array,
+      departments: Array
     },
     data() {
       var planPass = (rule, value, callback) => {
@@ -590,7 +603,8 @@
             }
           }),
           gov_plane_id: res.gov_plane_id,
-          gov_plane: res.gov_plane
+          gov_plane: res.gov_plane,
+          contract_carry_department: res.contract_carry_department.map(i => i.carry_department_id)
         }
         this.$refs['govPlane'].selected = res.gov_plane
         this.plan = this.detail.plan
@@ -619,7 +633,8 @@
           contract_plan_links: this.detail.plan.map(item => {
             return item.value
           }),
-          gov_plane_id: this.detail.gov_plane_id
+          gov_plane_id: this.detail.gov_plane_id,
+          contract_carry_department: this.detail.contract_carry_department.map(i => ({carry_department_id: i}))
         }).then(res => {
           this.isShowEditor = false
           Message({

src/views/contract/contractList.vue

@@ -256,6 +256,18 @@
           </div>
         </div>
       </template>
+      <template #contract_carry_department>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            执行科室
+          </div>
+          <div class="xy-table-item-content">
+            <el-select multiple v-model="form.contract_carry_department" placeholder="请选择责任科室" style="width: 300px;">
+              <el-option v-for="item in departments" :value="item.id" :label="item.name"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
       <template v-slot:is_simple>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -467,7 +479,7 @@
     </xy-dialog>
 
     <!--    编辑-->
-    <editor ref="editor" :is-show-editor.sync="isShowEditor" :money-way="moneyWay" :purchase-type="purchaseType"
+    <editor ref="editor" :departments="departments" :is-show-editor.sync="isShowEditor" :money-way="moneyWay" :purchase-type="purchaseType"
             :purchase-way="purchaseWay" @success="getContracts"></editor>
 
     <!--    查看-->
@@ -985,6 +997,20 @@ export default {
           formatter: (cell, data, value) => {
             return parseTime(new Date(value), "{y}-{m}-{d}")
           }
+        },
+        {
+          label: "执行科室",
+          minWidth: 200,
+          prop: "contract_carry_department",
+          customFn: row => {
+            return (
+              <div>
+                { row.contract_carry_department.map(i => {
+                  return (<Tag color="primary">{i.carry_department.name}</Tag>)
+                }) }
+              </div>
+            )
+          }
         }
       ],
       //总计
@@ -1109,6 +1135,7 @@ export default {
         plan: [],
         is_substitute: 0,
         gov_plane_id: '',
+        contract_carry_department: [],
       },
       plan: [],
       rules: {
@@ -1724,7 +1751,8 @@ export default {
         supply:this.form.supply,
         money:this.form?.money,
         status:this.form?.is_simple ? 2 : 1,
-        gov_plane_id: this.form.gov_plane_id
+        gov_plane_id: this.form.gov_plane_id,
+        contract_carry_department: this.form.contract_carry_department.map(i => ({carry_department_id: i}))
       }).then(res => {
         this.isShowAdd = false
         Message({

src/views/statisticalReport/budgetProgress.vue

@@ -158,7 +158,7 @@
             customFn: (row) => {
               return (<div>
                 <el-progress percentage = {
-                  (Number(row.update_money) && Number(row.money)) ? Number((Number(row.calculation_result || 0)*100).toFixed(2)) : 100
+                  Number((Number(row.calculation_result || 0)*100).toFixed(2))
                 } > </el-progress> </div>
               )
             }