Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

build/utils.js

@@ -16,9 +16,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
-// let devModules = ['all']
-// let devModules = ['index', 'statisticalReport', 'appoint']
 let devModules = ['all']
+// let devModules = ['index', 'statisticalReport', 'appoint', 'ADMINISTRATORS']
+// let devModules = ['all']
 
 // let devModules = ['index', 'ADMINISTRATORS']
 

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -26,6 +26,29 @@
             clearable
           ></el-input>
         </el-form-item>
+        <el-form-item>
+          <el-select
+            v-model="screen1"
+            placeholder="请选择需筛选的内容"
+            clearable
+            @change="changeScreen"
+            style="width:90px"
+          >
+            <el-option
+              v-for="item in options1"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-input
+            style="width:150px"
+            v-model="input1"
+            placeholder="请输入查询条件"
+            clearable
+          ></el-input>
+        </el-form-item>
         <el-form-item>
           <label class="el-form-item__label" style="width: auto;"
             >订单日期：</label
@@ -1520,6 +1543,26 @@ export default {
           lable: '分录ID'
         }
       ],
+      input1: null,
+      screen1: '',
+      options1: [
+        {
+          value: '客户',
+          lable: '客户'
+        },
+        {
+          value: '承运商',
+          lable: '承运商'
+        },
+        {
+          value: '车牌号',
+          lable: '车牌号'
+        },
+        {
+          value: '分录ID',
+          lable: '分录ID'
+        }
+      ],
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() > Date.now()
@@ -2404,9 +2447,9 @@ export default {
         })
       }
     },
-    selectOne(selection, row){
-      console.log("selection:",row);
-      this.rowClick(row);
+    selectOne(selection, row) {
+      console.log('selection:', row)
+      this.rowClick(row)
     },
     handleSelectionChange() {
       console.log(this.$refs.tableRef.selection, 'selection')
@@ -3869,6 +3912,17 @@ export default {
       } else {
         remark = this.input
       }
+      if (this.screen1 == '客户') {
+        consigneeName = this.input1
+      } else if (this.screen1 == '承运商') {
+        carrierName = this.input1
+      } else if (this.screen1 == '车牌号') {
+        capacityNo = this.input1
+      } else if (this.screen == '分录ID') {
+        easPrimaryId = this.input
+      } else {
+        remark = this.input1
+      }
       this.axios
         .post(
           '/api/v1/tms/getSaleSteelReport?startTime=' +
@@ -3997,6 +4051,15 @@ export default {
       } else {
         remark = this.input
       }
+      if (this.screen1 == '客户') {
+        consigneeName = this.input1
+      } else if (this.screen1 == '承运商') {
+        carrierName = this.input1
+      } else if (this.screen1 == '车牌号') {
+        capacityNo = this.input1
+      } else {
+        remark = this.input1
+      }
       if (getCookie('orgCode') == 'chengyunshang') {
         carrierSsoId = getCookie('userId')
       }