价格申报单搜索条件，其他Bug修复

src/views/purchase/DemandSummary/index.vue

@@ -261,7 +261,7 @@
           :checkbox-config="{trigger:'row', highlight: true, range: true}"
           :column-config="{resizable: true}"
         >
-          <vxe-column type="checkbox" width="40" fixed="left"/>
+          <vxe-column type="checkbox" width="50" fixed="left"/>
           <vxe-column show-header-overflow show-overflow  title="序号" type="seq" align="center" width="50px" fixed="left"/>
           <!-- <vxe-column show-header-overflow show-overflow v-if="showColumn.status" title="行号" align="center" field="rowNo"/> -->
           <vxe-column show-header-overflow show-overflow v-if="showColumn.status" title="行状态" align="center" field="status" width="50px" :formatter="hangStatus"/>
@@ -587,7 +587,6 @@ export default {
     getSummaries(param) {
       const { columns, data } = param;
       const sums = [];
-      console.log('Lie', columns)
       columns.forEach((column, index) => {
         if (index === 0) {
           sums.push('合计');
@@ -649,17 +648,16 @@ export default {
         if (res.code === 200) {
           this.tableList = res.rows
           this.total = res.total
-          let arrs = []
-          this.$refs.table.$children.forEach(item => {
-            if (item.label != undefined && item.prop != undefined) {
-              arrs.push({
-                label: item.label,
-                prop: item.prop
-              })
-            }
-          })
-          this.arrs = arrs
-          console.log('获取表头数据', arrs)
+          // let arrs = []
+          // this.$refs.table.$children.forEach(item => {
+          //   if (item.label != undefined && item.prop != undefined) {
+          //     arrs.push({
+          //       label: item.label,
+          //       prop: item.prop
+          //     })
+          //   }
+          // })
+          // this.arrs = arrs
         }
       }).then(() => {
         // 合计不显示重绘

src/views/purchase/PurchaseDemandList/add.vue

@@ -192,7 +192,7 @@
           :validConfig="{autoPos: true}">
         >
           <ux-table-column resizable type="checkbox" fixed="left"/>
-          <ux-table-column resizable title="序号" type="index" align="center" width="50px"/>
+          <!-- <ux-table-column resizable title="序号" type="index" align="center" width="50px"/> -->
           <ux-table-column resizable title="行号" align="center" field="rowNo" width="50px">
             <template v-slot="scope">
               {{ scope.row.rowNo = scope.rowIndex + 1 + "0" }}
@@ -278,7 +278,7 @@
           </ux-table-column>
           <ux-table-column resizable title="有效期" align="center"  field="expiry" width="100px"/>
           <ux-table-column resizable title="有效期单位" align="center"  field="expiryUnit" width="100px"/>
-          <ux-table-column resizable title="安全库存" align="center"  field="safeStock" width="100px"/>
+          <!-- <ux-table-column resizable title="安全库存" align="center"  field="safeStock" width="100px"/> -->
           <ux-table-column resizable title="注册人" align="center"  field="registrant" width="100px"/>
           <!-- <ux-table-column resizable title="预留比例" align="center" field="reservedProportion" width="120px" edit-render>
             <template v-slot:edit="scope">
@@ -1833,6 +1833,7 @@ export default {
               if(this.adjust.warehouseName) {
                 item.deliveryWarehouse = this.adjust.warehouse
                 item.deliveryWarehouseName = this.adjust.warehouseName
+                item.csFlag = this.adjust.csFlag
                 item.deliveryAllocation = this.adjust.allocation
                 item.deliveryAllocationName = this.adjust.allocationName
               }

src/views/purchase/apply/columns.js

@@ -86,23 +86,53 @@ export default function useColumns() {
       },
     },
     {
-      item: { key: "currencyName", title: "币种" },
+      item: { key: "materialCodeList", title: "物料编码" },
       attr: {
-        is: "el-popover-select-v2",
-        referName: "CURRENCY_PARAM",
-        valueKey: "name",
-        dataMapping: { currency: "id", currencyName: "name" },
+        clearable: true,
+        is: "el-popover-multiple-select-v2",
+        valueKey: "code",
+        referName: "MATERIAL_PARAM",
       },
     },
     {
-      item: { key: "puDeptName", title: "采购部门" },
+      item: { key: "materialCodes", title: "物料编码" },
+      attr: {
+        clearable: true,
+        is: "el-input",
+        placeholder: '多物料编码使用 , 隔开',
+      },
+    },
+    {
+      item: { width: 100, key: "manufacturer", title: "生产厂家" },
       attr: {
         is: "el-popover-select-v2",
-        referName: "DEPT_PARAM",
-        valueKey: "name",
-        dataMapping: { puDept: "id", puDeptName: "name" },
+        clearable: true,
+        referName: "MANUFACTURER_PARAM",
+        valueKey: "id",
+        dataMapping: {
+          manufacturer: "id",
+          manufacturerName: "name",
+        },
       },
     },
+    // {
+    //   item: { key: "currencyName", title: "币种" },
+    //   attr: {
+    //     is: "el-popover-select-v2",
+    //     referName: "CURRENCY_PARAM",
+    //     valueKey: "name",
+    //     dataMapping: { currency: "id", currencyName: "name" },
+    //   },
+    // },
+    // {
+    //   item: { key: "puDeptName", title: "采购部门" },
+    //   attr: {
+    //     is: "el-popover-select-v2",
+    //     referName: "DEPT_PARAM",
+    //     valueKey: "name",
+    //     dataMapping: { puDept: "id", puDeptName: "name" },
+    //   },
+    // },
     {
       item: { key: "isEffective", title: "是否推价" },
       attr: {
@@ -119,6 +149,25 @@ export default function useColumns() {
         clearable: true,
       },
     },
+    {
+      item: { key: "explainStr", title: "内审备注" },
+      attr: {
+        clearable: true,
+        is: "el-input",
+      },
+    },
+    {
+      item: { width: 100, key: "billDates", title: "单据日期", span: 8 },
+      attr: {
+        clearable: true,
+        is: "el-date-picker",
+        type: "datetimerange",
+        rangeSeparator: "至",
+        startPlaceholder: "开始日期",
+        endPlaceholder: "结束日期",
+        valueFormat: "yyyy-MM-dd hh:mm:ss",
+      },
+    },
   ];
 
   return { TableColumns, SearchColumns };

src/views/purchase/apply/index.vue

@@ -80,7 +80,16 @@
       },
       // 查 询
       useQuery(prop, page) {
-        this.fetchList(prop, page);
+        const { billDates } = prop;
+        const [startTime, endTime] = billDates || [];
+        this.fetchList(
+        {
+          ...prop,
+          startTime,
+          endTime,
+        },
+        page
+      );
       },
       // 重 置
       useReset() {