Browse Source

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

lilei 4 years ago
parent
commit
5038b4c054

+ 13 - 5
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -218,7 +218,13 @@
     </a-card>
     <a-affix :offset-bottom="0">
       <div style="text-align: center;width: 100%;background-color: #fff;padding: 12px 0;box-shadow: 0 0 20px #dcdee2;">
-        <a-button type="primary" id="bulkWarehousingOrderEdit-submit" size="large" class="button-primary" @click="handleSubmit" style="padding: 0 60px;">提交</a-button>
+        <a-button
+          type="primary"
+          id="bulkWarehousingOrderEdit-submit"
+          size="large"
+          class="button-primary"
+          @click="handleSubmit"
+          style="padding: 0 60px;">提交</a-button>
       </div>
     </a-affix>
     <!-- 选择基本信息弹框 -->
@@ -461,7 +467,7 @@ export default {
         if (res.status == 200) {
           if (type == 'dealerProduct') { //  全部产品
             this.warehouseList = res.data
-            const defaultFlagInd = this.warehouseList.findIndex(item => item.defaultFlag == 1)
+            const defaultFlagInd = this.warehouseList.findIndex(item => (item.defaultFlag == 1 && item.wasteFlag == 0))
             this.loadData.map((item, index) => {
               // 全部产品中,仓库默认值为默认仓库,则仓位必然也为默认仓位,因此可批量设置默认仓位的值 all
               // 解决更改后不实时渲染问题
@@ -518,7 +524,7 @@ export default {
         loadData = this.chooseLoadData
       }
       this.$set(warehouseLocList, ind, data)
-      const defaultFlagInd = warehouseLocList[ind].findIndex(item => item.defaultFlag == 1)
+      const defaultFlagInd = warehouseLocList[ind].findIndex(item => (item.defaultFlag == 1 && item.wasteFlag == 0))
       //  有默认仓位则默认选择默认仓位,无默认仓位则默认选择第一个仓位
       if (defaultFlagInd > -1) { //  有默认仓位
         if (isAll == 'all') { //  批量设置默认仓位的值为默认仓位
@@ -535,8 +541,10 @@ export default {
           loadData[ind].nowWarehouseSn = loadData[ind].warehouseSn
         } else {
           this.$message.warning('当前仓库无仓位,请选择其他仓库')
-          loadData[ind].warehouseSn = loadData[ind].nowWarehouseSn
-          this.getWarehouseLocList(loadData[ind].warehouseSn, ind, type)
+          if (loadData[ind].warehouseSn != loadData[ind].nowWarehouseSn) { //  避免默认仓库下没有默认仓位导致死循环问题
+            loadData[ind].warehouseSn = loadData[ind].nowWarehouseSn
+            this.getWarehouseLocList(loadData[ind].warehouseSn, ind, type)
+          }
         }
       }
       //  仓库更改时,应与仓位一齐变更

+ 2 - 0
src/views/customerManagement/customerInfo/list.vue

@@ -230,6 +230,8 @@ export default {
       this.queryParam.customerTypeSn = undefined
       this.creatTime = []
       this.lastSaleTime = []
+      this.addrCityList = []
+      this.addrDistrictList = []
       this.$refs.table.refresh(true)
     },
     //  新增/编辑

+ 8 - 2
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -46,8 +46,10 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="库存数量是否为0">
-                <v-select code="FLAG" id="inventoryQueryList-zeroQtyFlag" v-model="queryParam.zeroQtyFlag" allowClear placeholder="请选择"></v-select>
+              <a-form-item label="库存情况">
+                <a-select placeholder="请选择库存情况" id="inventoryQueryList-zeroQtyFlag" allowClear v-model="queryParam.zeroQtyFlag">
+                  <a-select-option v-for="item in zeroQtyData" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+                </a-select>
               </a-form-item>
             </a-col>
           </template>
@@ -127,6 +129,10 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       brandData: [], //  产品品牌下拉数据
       typeData: [], //  产品分类下拉数据
+      zeroQtyData: [ //  库存情况
+        { name: '库存数量为0', id: '1' },
+        { name: '库存数量不为0', id: '0' }
+      ],
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },