Selaa lähdekoodia

Merge branch 'develop_szhj' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_szhj

lilei 3 vuotta sitten
vanhempi
commit
bd7bf68678

+ 2 - 2
src/api/shelf.js

@@ -70,14 +70,14 @@ export const shelfProductParseProducts = params => {
 // 货架  货位产品  批量插入
 export const shelfProductBatchInsert = params => {
   return axios({
-    url: '/shelf/placeProduct/saveBatch',
+    url: '/shelf/placeProduct/saveBatchExcel',
     data: params,
     method: 'post'
   })
 }
 // 货架 箭冠产品  分页
 export const shelfDealerProductList = (params) => {
-  const url = `/dealerProduct/queryPageForXPRH/${params.pageNo}/${params.pageSize}`
+  const url = `/product/queryPageForXPRH/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({

+ 8 - 0
src/api/shelfRecall.js

@@ -45,6 +45,14 @@ export const shelfRecallSave = params => {
     method: 'post'
   })
 }
+// 查询不同状态的数据条数
+export const shelfRecallStateCount = (params) => {
+  return axios({
+    url: '/shelfRecall/queryStateCount',
+    data: params,
+    method: 'post'
+  })
+}
 // 删除仓位
 export const warehouseLocDel = params => {
   return axios({

+ 1 - 1
src/components/Table/index.js

@@ -389,7 +389,7 @@ export default {
       return props[k]
     })
     if (!this.isSucceed) { // 请求失败
-      props['locale'] = { emptyText: '网络异常,请点击按钮刷新' }
+      props['locale'] = { emptyText: '暂时无法获取数据,请刷新页面重试' }
     }
     // isSucceed
     const table = (

+ 1 - 1
src/views/common/productJqList.vue

@@ -4,7 +4,7 @@
     show-search
     label-in-value
     :value="productCode"
-    placeholder="请输入名称搜索"
+    placeholder="请输入产品编码搜索"
     style="width: 100%"
     :filter-option="false"
     :dropdownMatchSelectWidth="false"

+ 13 - 5
src/views/numsGoodsShelves/shelfSet/bindProductModal.vue

@@ -161,7 +161,7 @@ export default {
           const form = JSON.parse(JSON.stringify(_this.form))
           form.shelfPlaceSn = _this.nowData && _this.nowData.shelfPlaceSn
           if (this.type != 'bind') { // 修改信息、更换产品
-            form.shelfProductSn = _this.nowData && _this.nowData.shelfProductSn
+            form.shelfProductSn = _this.nowData && _this.nowData.shelfProductApiEntity && _this.nowData.shelfProductApiEntity.shelfProductSn
           }
           _this.spinning = true
           shelfProductSave(form).then(res => {
@@ -197,6 +197,17 @@ export default {
           this.$refs.ruleForm.resetFields()
         }
       })
+    },
+    resetData(){
+      this.form.productSn = undefined
+      this.form.productCode = undefined
+      this.form.price = ''
+      this.form.cost = ''
+      this.form.maxQty = ''
+      if (this.$refs.productJqList) {
+        this.$refs.productJqList.resetForm()
+      }
+      this.$refs.ruleForm.resetFields(['productSn'])
     }
   },
   watch: {
@@ -208,10 +219,7 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
-        this.$refs.ruleForm.resetFields()
-        if (this.$refs.productJqList) {
-          this.$refs.productJqList.resetForm()
-        }
+        this.resetData()
         this.productName = ''
         this.productInfo = null
       } else {

+ 3 - 3
src/views/numsGoodsShelves/shelfSet/chooseImportModal.vue

@@ -108,8 +108,8 @@ export default {
       shelfProductParseProducts(this.paramsData).then(res => {
         this.loading = false
         if (res.status == 200) {
-          if (res.data.okList && res.data.okList.length > 0) {
-            res.data.okList.map((item, index) => {
+          if (res.data.successList && res.data.successList.length > 0) {
+            res.data.successList.map((item, index) => {
               item.no = index + 1
             })
           }
@@ -118,7 +118,7 @@ export default {
               item.no = index + 1
             })
           }
-          _this.loadData = res.data.okList || []
+          _this.loadData = res.data.successList || []
           _this.unLoadData = res.data.failList || []
         }
       })

+ 1 - 5
src/views/numsGoodsShelves/shelfSet/set.vue

@@ -95,7 +95,7 @@
       </a-card>
     </a-spin>
     <!-- 修改信息/绑定产品/更换产品 -->
-    <bind-product-modal :openModal="openModal" :type="modalType" :nowData="nowData" @ok="handleOk" @close="handleCancel" />
+    <bind-product-modal :openModal="openModal" :type="modalType" :nowData="nowData" @ok="$refs.table.refresh()" @close="handleCancel" />
     <!-- 更换产品 -->
     <common-modal
       :openModal="openTipsModal"
@@ -200,13 +200,9 @@ export default {
       }else{
         this.nowData = null
       }
-      this.nowData = row || null
       this.modalType = type
       this.openModal = true
     },
-    handleOk () {
-      this.$refs.table.refresh()
-    },
     handleCancel () {
       this.nowData = null
       this.openModal = false