Redeem 1 年之前
父節點
當前提交
f0a922d47c

+ 6 - 2
src/components/DilCommonUI/packages/table/src/table.js

@@ -104,7 +104,9 @@ export default {
               //执行成功的回调
               this.$emit('func', response.data.data)
               this.refreshColumnData(d.columnData)
-              this.$refs.mainTable.clearSelection()
+              this.$nextTick(() => {
+                this.$refs.mainTable.clearSelection()
+              })
 
               //this.$refs.mainTable.getTableConfig();
               this.isShow = true
@@ -133,7 +135,9 @@ export default {
               //执行成功的回调
               this.$emit('func', response.data.data)
               this.refreshColumnData(d.columnData)
-              this.$refs.mainTable.clearSelection()
+              this.$nextTick(() => {
+                this.$refs.mainTable.clearSelection()
+              })
 
               //this.$refs.mainTable.getTableConfig();
               this.isShow = true

+ 3 - 3
src/components/DilCommonUI/packages/table/src/table.vue

@@ -291,9 +291,9 @@ export default {
       console.log('我尽力了')
       this.requestDataDebounce()
       // 多选表格清空用户的选择
-      this.$refs.mainTable.clearSelectionFun()
-      // if (this.isClear != '1') {
-      // }
+      if (this.isClear != '1') {
+        this.$refs.mainTable.clearSelection()
+      }
     },
     rowDbClick(row) {
       this.$emit('rowDbClick', row)

+ 21 - 0
src/views/OYE/components/exportTranPlan.js

@@ -1,4 +1,5 @@
 import { sjTime, isNumber } from '@/utils/sharedJsFile'
+import { getCookie } from '@/utils/util.js'
 export default {
   data() {
     return {
@@ -159,6 +160,25 @@ export default {
               }
               if (e1.includes('摘要')) {
                 map.saleRemark = e[e1]
+                if (typeof map.saleRemark === 'string') {
+                  // 首先中文逗号转英文逗号
+                  map.saleRemark = map.saleRemark.replace(',', ',')
+                  let reg = /钢材.*组/g
+                  let reg1 = /直发.*(,|\s){0,1}/
+                  let saleAreaList = map.saleRemark.match(reg)
+                  let directlyList = map.saleRemark.match(reg1)
+                  if (saleAreaList != null && saleAreaList.length > 0) {
+                    map.saleRemark = saleAreaList[0]
+                  } else {
+                    throw new Error(
+                      `该Excel第--${index +
+                        2}--行-“摘要填写”错误,请核实后再输入(应为“钢材某某组”)`
+                    )
+                  }
+                  if (directlyList != null && directlyList.length > 0) {
+                    map.saleRemark = map.saleRemark + ',' + directlyList[0]
+                  }
+                }
               }
               if (e1.includes('省')) {
                 map.province = e[e1]
@@ -298,6 +318,7 @@ export default {
           arr.push(mapMaterial)
         })
         map.shipperId = 1
+        map.userName = getCookie('loginName')
         map.mapList = arr
         saleOrderListMap.push(map)
       })

+ 3 - 0
src/views/OYE/components/oYeInbound.vue

@@ -186,6 +186,9 @@ export default {
       if (this.loginName != null) {
         queryMap['consigneeName'] = this.loginName
       }
+      if (this.orgCode == 'xiaoshouyewuyuan') {
+        queryMap['saler'] = getCookie('loginName')
+      }
       this.options.requestQuery = JSON.parse(JSON.stringify(queryMap))
     },
     search() {

+ 3 - 1
src/views/OYE/components/oYeOutbound.vue

@@ -174,7 +174,9 @@ export default {
       if (this.loginName != null) {
         queryMap['consigneeName'] = this.loginName
       }
-
+      if (this.orgCode == 'xiaoshouyewuyuan') {
+        queryMap['saler'] = getCookie('loginName')
+      }
       this.options.requestQuery = JSON.parse(JSON.stringify(queryMap))
     },
     search() {

+ 3 - 0
src/views/OYE/components/oYeRealTimeInventory.vue

@@ -335,6 +335,9 @@ export default {
       if (this.loginName != null) {
         queryMap['consigneeName'] = this.loginName
       }
+      if (this.orgCode == 'xiaoshouyewuyuan') {
+        queryMap['saler'] = getCookie('loginName')
+      }
       this.options.requestQuery = JSON.parse(JSON.stringify(queryMap))
     },
     search() {

+ 17 - 3
src/views/OYE/components/oYeTransPlan.vue

@@ -243,7 +243,6 @@
               :trigger-on-focus="false"
               :disabled="planForm.county == null ? true : false"
             >
-              >
             </el-autocomplete>
           </el-form-item>
           <el-form-item label="收货客户电话">
@@ -564,6 +563,7 @@
 <script>
 import { getCookie, formatDate } from '@/utils/util.js'
 import exportTranPlan from './exportTranPlan.js'
+import { sjTime, isIntegerNumber } from '@/utils/sharedJsFile'
 export default {
   extends: exportTranPlan,
   data() {
@@ -615,7 +615,7 @@ export default {
       startTime: generateStartDate(),
       endTime: generateEndDate(),
       approvingOptions: {
-        requestUrl: '/api/v1/ams/getTransPlan?apiId=533',
+        requestUrl: '',
         requestQuery: {
           orderStatus: 0,
           deleted: 0
@@ -623,7 +623,7 @@ export default {
         selectionType: 'select'
       },
       approvedOptions: {
-        requestUrl: '/api/v1/ams/getTransPlan?apiId=533',
+        requestUrl: '',
         requestQuery: {
           orderStatus: 4,
           deleted: 0
@@ -784,6 +784,7 @@ export default {
     this.getOyeSaleArea()
     this.getAllsaleMan()
     this.getAllProvince()
+    this.getRequestUrl()
   },
   watch: {
     saleRemark(val) {
@@ -857,6 +858,9 @@ export default {
       if (this.orgCode == 'shouhuokehu') {
         queryOp['consigneeName'] = this.userName
       }
+      if (this.orgCode == 'xiaoshouyewuyuan') {
+        queryOp['saler'] = this.loginName
+      }
       this.approvingOptions.requestQuery = {
         orderStatus: 0,
         deleted: 0,
@@ -891,6 +895,7 @@ export default {
             this.isNiTui = 0
             if (res.data.code == '200') {
               var restaurants = res.data.data
+              console.log(restaurants, 'restaurants')
               var results = queryString
                 ? restaurants.filter(this.createFilter1(queryString))
                 : restaurants
@@ -900,6 +905,14 @@ export default {
           })
       }
     },
+    createFilter1(queryString) {
+      return restaurants => {
+        return (
+          restaurants.value.toLowerCase().indexOf(queryString.toLowerCase()) >
+          -1
+        )
+      }
+    },
     selectionChange(selection) {
       console.log(selection, 'selection')
       this.materialList1 = []
@@ -1386,6 +1399,7 @@ export default {
       let data = { ...this.planForm }
       data.salerId = data.saleMan
       data.mapList = this.selectionList
+      data.userName = getCookie('loginName')
       this.axios.post('/api/v1/ams/addTransPlan', data).then(res => {
         if (res.data.status == 'succeed') {
           this.$message.success('添加成功!')

+ 8 - 5
src/views/OYE/components/oYeTransResult.vue

@@ -2244,13 +2244,9 @@ export default {
             let map = {}
             map.label = item.warehouseName
             map.value = item.warehouseName
+
             return map
           })
-          if (getCookie('orgCode') == 'chengyunshang') {
-            this.oYeWarehouseList = this.oYeWarehouseList.filter(item => {
-              return item.remark == JSON.parse(getCookie('userInfo')).userName
-            })
-          }
         })
     },
     confireInboundTo(item) {
@@ -2322,6 +2318,13 @@ export default {
           .then(res => {
             this.steelMap = res.data.data
             this.steelMap.userName = getCookie('loginName')
+            let inboundWarehouse = null
+            if (getCookie('orgCode') == 'ouyechangwaiku') {
+              inboundWarehouse = getCookie('loginName')
+              this.steelMap.mapList.forEach(item => {
+                item.inboundWarehouse = inboundWarehouse
+              })
+            }
             this.confireInboundVisible = true
             this.getSpanArr1(res.data.data.mapList)
           })

+ 3 - 0
src/views/OYE/components/sendReceiveReport.vue

@@ -217,6 +217,9 @@ export default {
 
       optionsQuery['startTime'] = this.startTime
       optionsQuery['endTime'] = this.endTime
+      if (this.orgCode == 'xiaoshouyewuyuan') {
+        optionsQuery['saler'] = getCookie('loginName')
+      }
       this.axios
         .post('/api/v1/wms/receiveSendReport', optionsQuery)
         .then(res => {