init

src/views/contract/contractEdit.vue

@@ -452,7 +452,7 @@
             :rules="rules"
             label-width="180px"
           >
-            <el-form-item prop="name" label="采购内容">
+            <el-form-item prop="common_type" label="采购内容">
               <el-select
                 placeholder="请填写采购内容"
                 v-model="form.common_type"
@@ -461,7 +461,7 @@
                 allow-create
                 default-first-option
                 clearable
-                @change="e => e ? form.name = `${e}（${$moment().format('YYYY-MM-DD')}）` : ''"
+                @change="e => e ? form.name = `${e}（${$moment().format('YYYY-MM-DD HHmm')}）` : ''"
               >
                 <el-option v-for="item in commonPurchaseTypes" :key="item.value" :label="item.value" :value="item.value" />
               </el-select>
@@ -1776,7 +1776,7 @@ export default {
         })
       } else {
         MessageBox.confirm("请选择类型", "提示", {
-          confirmButtonText: "政府采购",
+          confirmButtonText: "预算计划支出",
           cancelButtonText: "一般采购"
         }).then(_ => {
           next(vm => {

src/views/contract/contractList.vue

@@ -1854,7 +1854,8 @@ export default {
       let baseInfo = {}
       if (row.is_common_purchase) {
         baseInfo = {
-          "caigouneirong": row.name || "",
+          "caigoushuoming": row.name || "",
+          "caigouneirong": row.common_type,
         }
       }
       switch (row.flow_mod_id) {
@@ -2347,7 +2348,7 @@ export default {
         "other": new Flow()
       }
       const common_purchase = item.flow_list.find(i => i.tag === 'common_purchase')
-      const caigou = item.flow_list.find(i => i.tag === 'caigou')
+      const caigou = item.flow_list.find(i => i.custom_model_id === item.flow_mod_id)
       const shenpi = item.flow_list.find(i => i.tag === 'contract')
       if (item.is_purchase) {
         //为采购项目
@@ -2379,8 +2380,7 @@ export default {
         if (item.is_contract) {
           //为合同 不为网上商城
           flowStatus["shenpi"].setStatus(shenpi?.flow_status ?? 2)
-          if ((!shenpi?.flow_status || shenpi?.flow_status === 2) && (item.invite_status === 1 ||
+          if ((!shenpi?.flow_status || shenpi?.flow_status === 2) && ((item.is_tender_audit && item.invite_status === 1) || (!item.is_tender_audit && (caigou?.flow_status === 1 || common_purchase?.flow_status === 1)))) {
-            ((item.purchase_way?.remark === 'false' || item.flow_mod_id === 5 || item.flow_mod_id === 29) && caigou?.flow_status === 1))) {
             //审批未开始 走招标招标完成或不走招标采购完成
             flowStatus["shenpi"].setExecutable(true)
           }