no message

src/views/basic_data/stock/electricalStorageCharges.vue

@@ -38,7 +38,7 @@
                   <el-date-picker
                     v-model="screenForm.orderDate"
                     type="datetimerange"
-                    :default-time="['00:00:00','23:59:59']"
+                    :default-time="['00:00:00', '23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -53,7 +53,7 @@
                   <el-date-picker
                     v-model="screenForm.invoiceDate"
                     type="datetimerange"
-:default-time="['00:00:00','23:59:59']"
+                    :default-time="['00:00:00', '23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -108,7 +108,7 @@
                   <el-date-picker
                     v-model="screenForm.approvalDate"
                     type="datetimerange"
-:default-time="['00:00:00','23:59:59']"
+                    :default-time="['00:00:00', '23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -136,7 +136,7 @@
                   <el-date-picker
                     v-model="screenForm.saleDate"
                     type="datetimerange"
-:default-time="['00:00:00','23:59:59']"
+                    :default-time="['00:00:00', '23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -277,7 +277,7 @@ export default {
       listLoading: false, // 列表加载loading
       screenForm: {
         correspondId: [],
-        categoryNum:[],
+        categoryNum: [],
         customerName: '',
         customerNumber: '',
         endTime: '',
@@ -387,18 +387,18 @@ export default {
   computed: {
     exParams() {
       return {
-        categoryNum:this.screenForm.categoryNum.join(','),
+        categoryNum: this.screenForm.categoryNum.join(','),
         correspondId: this.screenForm.correspondId.join(','),
         customerName: this.screenForm.customerName,
         customerNumber: this.screenForm.customerNumber,
-        endTime: this.screenForm.orderDate?this.screenForm.orderDate[1] :'',
+        endTime: this.screenForm.orderDate ? this.screenForm.orderDate[1] : '',
         id: this.screenForm.id,
-        invoiceEndTime: this.screenForm.invoiceDate?this.screenForm.invoiceDate[1]:'',
-        invoiceStartTime:this.screenForm.invoiceDate? this.screenForm.invoiceDate[0]:'',
-        approvalStartTime:this.screenForm.approvalDate? this.screenForm.approvalDate[0]:'',
-        approvalEndTime:this.screenForm.approvalDate? this.screenForm.approvalDate[1]:'',
-        saleStartTime:this.screenForm.saleDate? this.screenForm.saleDate[0]:'',
-        saleEndTime:this.screenForm.saleDate? this.screenForm.saleDate[1]:'',
+        invoiceEndTime: this.screenForm.invoiceDate ? this.screenForm.invoiceDate[1] : '',
+        invoiceStartTime: this.screenForm.invoiceDate ? this.screenForm.invoiceDate[0] : '',
+        approvalStartTime: this.screenForm.approvalDate ? this.screenForm.approvalDate[0] : '',
+        approvalEndTime: this.screenForm.approvalDate ? this.screenForm.approvalDate[1] : '',
+        saleStartTime: this.screenForm.saleDate ? this.screenForm.saleDate[0] : '',
+        saleEndTime: this.screenForm.saleDate ? this.screenForm.saleDate[1] : '',
         saleExamineStatus: this.screenForm.saleExamineStatus,
         mainOrderId: this.screenForm.mainOrderId,
         materialName: this.screenForm.materialName,
@@ -406,7 +406,7 @@ export default {
         orderNo: this.screenForm.orderNo,
         orderType: this.screenForm.orderType,
         specification: this.screenForm.specification,
-        startTime:this.screenForm.orderDate? this.screenForm.orderDate[0]:''
+        startTime: this.screenForm.orderDate ? this.screenForm.orderDate[0] : ''
       }
     },
     filterOderType() {
@@ -433,18 +433,18 @@ export default {
       const params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        categoryNum:this.screenForm.categoryNum.join(','),
+        categoryNum: this.screenForm.categoryNum.join(','),
         correspondId: this.screenForm.correspondId.join(','),
         customerName: this.screenForm.customerName,
         customerNumber: this.screenForm.customerNumber,
-        endTime: this.screenForm.orderDate?this.screenForm.orderDate[1] :'',
+        endTime: this.screenForm.orderDate ? this.screenForm.orderDate[1] : '',
         id: this.screenForm.id,
-        invoiceEndTime: this.screenForm.invoiceDate?this.screenForm.invoiceDate[1]:'',
-        invoiceStartTime:this.screenForm.invoiceDate? this.screenForm.invoiceDate[0]:'',
-        approvalStartTime:this.screenForm.approvalDate? this.screenForm.approvalDate[0]:'',
-        approvalEndTime:this.screenForm.approvalDate? this.screenForm.approvalDate[1]:'',
-        saleStartTime:this.screenForm.saleDate? this.screenForm.saleDate[0]:'',
-        saleEndTime:this.screenForm.saleDate? this.screenForm.saleDate[1]:'',
+        invoiceEndTime: this.screenForm.invoiceDate ? this.screenForm.invoiceDate[1] : '',
+        invoiceStartTime: this.screenForm.invoiceDate ? this.screenForm.invoiceDate[0] : '',
+        approvalStartTime: this.screenForm.approvalDate ? this.screenForm.approvalDate[0] : '',
+        approvalEndTime: this.screenForm.approvalDate ? this.screenForm.approvalDate[1] : '',
+        saleStartTime: this.screenForm.saleDate ? this.screenForm.saleDate[0] : '',
+        saleEndTime: this.screenForm.saleDate ? this.screenForm.saleDate[1] : '',
         saleExamineStatus: this.screenForm.saleExamineStatus,
         mainOrderId: this.screenForm.mainOrderId,
         materialName: this.screenForm.materialName,
@@ -452,7 +452,7 @@ export default {
         orderNo: this.screenForm.orderNo,
         orderType: this.screenForm.orderType,
         specification: this.screenForm.specification,
-        startTime:this.screenForm.orderDate? this.screenForm.orderDate[0]:''
+        startTime: this.screenForm.orderDate ? this.screenForm.orderDate[0] : ''
       }
       this.listLoading = true
       saleStorageFeeListStorageFee(params).then(res => {
@@ -464,7 +464,7 @@ export default {
         this.dataList = res.data.records
         this.listTotal = res.data.total
         this.listLoading = false
-        console.log(res,this.dataList)
+        console.log(res, this.dataList)
       })
       this.getWarehouseList()
       this.getCategoryList()
@@ -497,7 +497,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$refs.screenForm.resetFields()
+      this.$refs.screenForm.resetFields()
       this.currentPage = 1
       this.getList()
     },

src/views/basic_data/stock/stock_fee_list.vue

@@ -38,7 +38,7 @@
                   <el-date-picker
                     v-model="screenForm.orderDate"
                     type="datetimerange"
-                    :default-time="['00:00:00','23:59:59']"
+                    :default-time="['00:00:00', '23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -53,7 +53,7 @@
                   <el-date-picker
                     v-model="screenForm.invoiceDate"
                     type="datetimerange"
-:default-time="['00:00:00','23:59:59']"
+                    :default-time="['00:00:00', '23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -108,7 +108,7 @@
                   <el-date-picker
                     v-model="screenForm.approvalDate"
                     type="datetimerange"
-:default-time="['00:00:00','23:59:59']"
+                    :default-time="['00:00:00', '23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -136,7 +136,7 @@
                   <el-date-picker
                     v-model="screenForm.saleDate"
                     type="datetimerange"
-:default-time="['00:00:00','23:59:59']"
+                    :default-time="['00:00:00', '23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -146,6 +146,18 @@
                   </el-date-picker>
                 </el-form-item>
               </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="存货类别" prop="categoryNum">
+                  <el-select v-model="screenForm.categoryNum" clearable filterable multiple>
+                    <el-option
+                      v-for="(item, index) in categoryList"
+                      :key="index"
+                      :label="item.name"
+                      :value="item.number"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </template>
@@ -219,6 +231,7 @@
             min-width="150"
             show-overflow-tooltip
           />
+          <el-table-column align="left" label="存货类别" prop="k3CategoryName" min-width="150" show-overflow-tooltip />
           <el-table-column align="left" label="仓库" prop="correspondName" min-width="150" show-overflow-tooltip />
           <el-table-column align="left" label="客户编号" prop="customerNumber" min-width="150" show-overflow-tooltip />
           <el-table-column align="left" label="客户名称" prop="customerName" min-width="150" show-overflow-tooltip />
@@ -281,6 +294,7 @@ export default {
         invoiceDate: [],
         approvalDate: [],
         saleDate: [],
+        categoryNum: [],
         saleExamineStatus: ''
       },
       typeList: [],
@@ -376,22 +390,23 @@ export default {
         correspondId: this.screenForm.correspondId.join(','),
         customerName: this.screenForm.customerName,
         customerNumber: this.screenForm.customerNumber,
-        endTime: this.screenForm.orderDate?this.screenForm.orderDate[1] :'',
+        endTime: this.screenForm.orderDate ? this.screenForm.orderDate[1] : '',
         id: this.screenForm.id,
-        invoiceEndTime: this.screenForm.invoiceDate?this.screenForm.invoiceDate[1]:'',
-        invoiceStartTime:this.screenForm.invoiceDate? this.screenForm.invoiceDate[0]:'',
-        approvalStartTime:this.screenForm.approvalDate? this.screenForm.approvalDate[0]:'',
-        approvalEndTime:this.screenForm.approvalDate? this.screenForm.approvalDate[1]:'',
-        saleStartTime:this.screenForm.saleDate? this.screenForm.saleDate[0]:'',
-        saleEndTime:this.screenForm.saleDate? this.screenForm.saleDate[1]:'',
+        invoiceEndTime: this.screenForm.invoiceDate ? this.screenForm.invoiceDate[1] : '',
+        invoiceStartTime: this.screenForm.invoiceDate ? this.screenForm.invoiceDate[0] : '',
+        approvalStartTime: this.screenForm.approvalDate ? this.screenForm.approvalDate[0] : '',
+        approvalEndTime: this.screenForm.approvalDate ? this.screenForm.approvalDate[1] : '',
+        saleStartTime: this.screenForm.saleDate ? this.screenForm.saleDate[0] : '',
+        saleEndTime: this.screenForm.saleDate ? this.screenForm.saleDate[1] : '',
         saleExamineStatus: this.screenForm.saleExamineStatus,
+        categoryNum: this.screenForm.categoryNum.join(','),
         mainOrderId: this.screenForm.mainOrderId,
         materialName: this.screenForm.materialName,
         materialNumber: this.screenForm.materialNumber,
         orderNo: this.screenForm.orderNo,
         orderType: this.screenForm.orderType,
         specification: this.screenForm.specification,
-        startTime:this.screenForm.orderDate? this.screenForm.orderDate[0]:''
+        startTime: this.screenForm.orderDate ? this.screenForm.orderDate[0] : ''
       }
     },
     filterOderType() {
@@ -421,22 +436,23 @@ export default {
         correspondId: this.screenForm.correspondId.join(','),
         customerName: this.screenForm.customerName,
         customerNumber: this.screenForm.customerNumber,
-        endTime: this.screenForm.orderDate?this.screenForm.orderDate[1] :'',
+        endTime: this.screenForm.orderDate ? this.screenForm.orderDate[1] : '',
         id: this.screenForm.id,
-        invoiceEndTime: this.screenForm.invoiceDate?this.screenForm.invoiceDate[1]:'',
-        invoiceStartTime:this.screenForm.invoiceDate? this.screenForm.invoiceDate[0]:'',
-        approvalStartTime:this.screenForm.approvalDate? this.screenForm.approvalDate[0]:'',
-        approvalEndTime:this.screenForm.approvalDate? this.screenForm.approvalDate[1]:'',
-        saleStartTime:this.screenForm.saleDate? this.screenForm.saleDate[0]:'',
-        saleEndTime:this.screenForm.saleDate? this.screenForm.saleDate[1]:'',
+        invoiceEndTime: this.screenForm.invoiceDate ? this.screenForm.invoiceDate[1] : '',
+        invoiceStartTime: this.screenForm.invoiceDate ? this.screenForm.invoiceDate[0] : '',
+        approvalStartTime: this.screenForm.approvalDate ? this.screenForm.approvalDate[0] : '',
+        approvalEndTime: this.screenForm.approvalDate ? this.screenForm.approvalDate[1] : '',
+        saleStartTime: this.screenForm.saleDate ? this.screenForm.saleDate[0] : '',
+        saleEndTime: this.screenForm.saleDate ? this.screenForm.saleDate[1] : '',
         saleExamineStatus: this.screenForm.saleExamineStatus,
+        categoryNum: this.screenForm.categoryNum.join(','),
         mainOrderId: this.screenForm.mainOrderId,
         materialName: this.screenForm.materialName,
         materialNumber: this.screenForm.materialNumber,
         orderNo: this.screenForm.orderNo,
         orderType: this.screenForm.orderType,
         specification: this.screenForm.specification,
-        startTime:this.screenForm.orderDate? this.screenForm.orderDate[0]:''
+        startTime: this.screenForm.orderDate ? this.screenForm.orderDate[0] : ''
       }
       this.listLoading = true
       getListStorageFee(params).then(res => {
@@ -448,7 +464,7 @@ export default {
         this.dataList = res.data.records
         this.listTotal = res.data.total
         this.listLoading = false
-        console.log(res,this.dataList)
+        console.log(res, this.dataList)
       })
       this.getWarehouseList()
       this.getCategoryList()
@@ -480,7 +496,7 @@ export default {
 
     // 重置筛选表单
     resetScreenForm() {
-        this.$refs.screenForm.resetFields()
+      this.$refs.screenForm.resetFields()
       this.currentPage = 1
       this.getList()
     },