Merge branch 'dev' into pre-production

src/option/finance/ReconciliationDepositSlip.js

@@ -712,6 +712,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: true,
     head: false,
   },
   // {
@@ -1485,6 +1486,7 @@ export const columnListB = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: true,
     head: false,
   },
   // {

src/views/finance/ReconciliationDepositSlip.vue

@@ -28,18 +28,35 @@
                   <el-option label="已计算" value="1" />
                 </el-select>
               </el-form-item>
-              <el-form-item label="签收状态">
-                <el-select
-                  v-model="item.query.signStatus"
-                  placeholder="请选择"
-                  style="width: 240px"
-                  clearable
-                >
-                  <el-option label="已签收" value="2" />
-                  <el-option label="未签收" value="0" />
-                  <el-option label="部分签收" value="1" />
-                </el-select>
-              </el-form-item>
+              <template v-if="details.pageStatus === 1">
+                <el-form-item label="签收状态">
+                  <el-select
+                    v-model="item.query.signStatuses"
+                    placeholder="请选择"
+                    style="width: 240px"
+                    clearable
+                    multiple
+                  >
+                    <el-option label="已签收" value="2" />
+                    <el-option label="未签收" value="0" />
+                    <el-option label="部分签收" value="1" />
+                  </el-select>
+                </el-form-item>
+              </template>
+              <template v-else>
+                <el-form-item label="签收状态">
+                  <el-select
+                    v-model="item.query.signStatus"
+                    placeholder="请选择"
+                    style="width: 240px"
+                    clearable
+                  >
+                    <el-option label="已签收" value="2" />
+                    <el-option label="未签收" value="0" />
+                    <el-option label="部分签收" value="1" />
+                  </el-select>
+                </el-form-item>
+              </template>
               <el-form-item label="计算时间">
                 <el-date-picker
                   v-model="item.query.calculateTimeSection"
@@ -411,6 +428,15 @@ const onLoad = async () => {
     // listType 1 -- toB ; 2 -- toC
     submitData.listType = details.pageStatus;
 
+    const keys = Object.keys(submitData);
+
+    for (let i = 0; i < keys.length; i++) {
+      const key = keys[i];
+
+      if (getObjType(submitData[key]) === 'array' && submitData[key].length === 0)
+        delete submitData[key];
+    }
+
     // 获取暂存单列表
     const res = await postPageList(submitData);
     console.log('res :>> ', res);