up

src/views/flow/create.vue

@@ -39,7 +39,7 @@
               <!-- 单条数据 -->
               <div v-if="config.flow.out_pay.length === 1">
                 <span @click="showContract(config.flow.out_pay[0].contract_id)" style="cursor: pointer;">
-                  本流程已关联资金预算管理：<span style="color:#409eff;">{{ config.flow.out_pay[0].contract.name }}</span>，点击查看完整信息链。
+                  本流程已关联资金预算管理：<span style="color:#409eff;">{{ config.flow.out_pay[0].contract?config.flow.out_pay[0].contract.name:'未知支出'+config.flow.out_pay[0].contract_id }}</span>，点击查看完整信息链。
                 </span>
               </div>
               <!-- 多条数据 -->
@@ -47,7 +47,7 @@
                 <span>本流程已关联{{ config.flow.out_pay.length }}条资金预算管理，分别是</span>
                 <span v-for="(pay, index) in config.flow.out_pay" :key="pay.id">
                   <span v-if="index > 0">、</span>
-                  <span @click="showContract(pay.contract_id)" style="cursor: pointer;color:#409eff;">{{ pay.contract.name }}</span>
+                  <span @click="showContract(pay.contract_id)" style="cursor: pointer;color:#409eff;">{{ pay.contract?pay.contract.name:'未知支出'+pay.contract_id }}</span>
                 </span>
                 <span>，可分别点击查看完整信息链。</span>
               </div>

src/views/flow/payList.vue

@@ -76,7 +76,7 @@
               </el-select>
               <el-select
                 v-model="pendingQuery.caigouneirong"
-                placeholder="采购内容"
+                placeholder="采购类别"
                 size="small"
                 clearable
                 filterable
@@ -138,7 +138,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                label="采购内容"
+                label="采购类别"
                 width="100"
                 align="center"
                 show-overflow-tooltip
@@ -373,7 +373,7 @@
               </el-select>
               <el-select
                 v-model="paidQuery.caigouneirong"
-                placeholder="采购内容"
+                placeholder="采购类别"
                 size="small"
                 clearable
                 filterable
@@ -386,6 +386,21 @@
                   :value="item"
                 />
               </el-select>
+              <el-select
+                v-model="paidQuery.status"
+                placeholder="是否支付完成"
+                size="small"
+                clearable
+                filterable
+                style="width: 150px"
+              >
+                <el-option
+                  v-for="item in [{label: '是', value: 1}, {label: '否', value: 0}]"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
               <el-button
                 type="primary"
                 size="small"
@@ -416,7 +431,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                label="采购内容"
+                label="采购类别"
                 width="100"
                 align="center"
                 show-overflow-tooltip
@@ -589,7 +604,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="采购内容"
+          label="采购类别"
           min-width="120"
           align="center"
           show-overflow-tooltip
@@ -734,7 +749,7 @@ export default {
       departments: [],
       users: [],
       purchasers: [], // 采购负责人列表
-      purchaseContents: [], // 采购内容列表
+      purchaseContents: [], // 采购类别列表
       waitList: [],
       activeTab: "pending",
       pendingQuery: {
@@ -762,6 +777,7 @@ export default {
         keywords: "",
         chengbanren_id: "",
         caigouneirong: "",
+        status: "",
       },
       paidRows: [],
       paidPage: 1,
@@ -818,7 +834,7 @@ export default {
       this.users = arr;
       // 保存采购负责人列表
       this.purchasers = res.users;
-      // 保存采购内容列表
+      // 保存采购类别列表
       this.purchaseContents = res.customModelFieldStub;
     },
     switchTab(tab) {
@@ -1502,6 +1518,9 @@ export default {
       if (this.paidQuery.caigouneirong) {
         params.caigouneirong = this.paidQuery.caigouneirong;
       }
+      if (this.paidQuery.status || this.paidQuery.status === 0) {
+        params.status = this.paidQuery.status?1:0;
+      }
       const res = await receiveList(params);
       this.paidTotal = res.total || 0;
       this.paidRows = (res.data || []).map((item) => ({
@@ -1543,7 +1562,7 @@ export default {
         this.pendingPageSize = 40;
       } else if (newTab === "paid") {
         this.paidPage = 1;
-        this.paidPageSize = 40;
+        this.paidPageSize = 10;
       }
 
       // 重置查询条件
@@ -1564,6 +1583,7 @@ export default {
           keywords: "",
           chengbanren_id: "",
           caigouneirong: "",
+          status: "",
         };
       }