瀏覽代碼

Merge branch 'develop_yh43' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh43

chenrui 11 月之前
父節點
當前提交
120d32c682

+ 18 - 19
src/views/purchasingManagement/bulkWarehousingOrder/productModal.vue

@@ -40,18 +40,18 @@
         <a-form-model-item label="产品名称" prop="productName">{{ form.productName || '--' }}</a-form-model-item>
         <a-form-model-item label="原厂编码" prop="productOrigCode">{{ form.productOrigCode || '--' }}</a-form-model-item>
         <a-form-model-item label="仓库仓位" prop="warehouseLocationSn">
-          {{ (nowData&&nowData.warehouseName) || '--' }} > 
-            <a-select 
+          {{ (nowData&&nowData.warehouseName) || '--' }} >
+          <a-select
             id="bulkWarehousingOrder-product-warehouse"
-             @change="changeWarehouseCascade" 
-             placeholder="请选择仓位" 
-             :allowClear="false" 
-             style="width: 50%;" 
-             v-model="form.warehouseLocationSn">
-              <a-select-option v-for="item in warehouseCascadeData" :value="item.sn">
-                {{ item.name }}
-              </a-select-option>
-            </a-select> 
+            @change="changeWarehouseCascade"
+            placeholder="请选择仓位"
+            :allowClear="false"
+            style="width: 50%;"
+            v-model="form.warehouseLocationSn">
+            <a-select-option v-for="item in warehouseCascadeData" :value="item.sn">
+              {{ item.name }}
+            </a-select-option>
+          </a-select>
         </a-form-model-item>
         <a-form-model-item label="成本价">
           <span style="margin-right:20px;">{{ form.productCost ? toThousands(form.productCost) : '--' }}</span>
@@ -150,7 +150,6 @@ export default {
   methods: {
     // 搜索产品
     fetchUser (value) {
-      console.log('fetching user', value)
       this.fetching = true
       const params = {
         product: {
@@ -190,7 +189,6 @@ export default {
         if (res.status == 200) {
           const data = res.data
           this.form = Object.assign(this.form, data)
-          // this.fetchUser(this.form.productCode)
           this.warehouseSnBackups = this.form.warehouseSn || undefined
           this.warehouseLocationSnBackups = this.form.warehouseLocationSn || undefined
           this.isGift = this.form.giftFlag == 1
@@ -236,7 +234,6 @@ export default {
             }
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })
@@ -251,21 +248,23 @@ export default {
       warehouseCascadeList({}).then(res => {
         if (res.status == 200) {
           // 默认仓库
-          const defSn = this.isShowWarehouse ? this.nowData.warehouseSn : this.defWarehouse&&this.defWarehouse.warehouseSn
+          const defSn = this.isShowWarehouse ? this.nowData.warehouseSn : this.defWarehouse && this.defWarehouse.warehouseSn
           _this.form.warehouseSn = defSn
           _this.warehouseSnBackups = defSn
           const data = res.data.find(item => item.warehouseSn == defSn)
-          console.log(data.warehouseLocationList)
-          if(data&&data.warehouseLocationList){
+          // 默认仓库下的仓位列表
+          if (data && data.warehouseLocationList) {
             data.warehouseLocationList.map(subItem => {
               subItem.sn = subItem.warehouseLocationSn
-              if(subItem.defaultFlag == 1){
+              // 取默认仓位
+              if (subItem.defaultFlag == 1) {
                 _this.form.warehouseLocationSn = subItem.warehouseLocationSn
                 _this.warehouseLocationSnBackups = subItem.warehouseLocationSn
               }
             })
+            // 仓库仓位树数据
             this.warehouseCascadeData = data.warehouseLocationList
-          }else{
+          } else {
             this.warehouseCascadeData = []
           }
         } else {

+ 0 - 15
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -83,14 +83,6 @@
         <!-- 操作按钮 -->
         <div class="table-operator">
           <a-button v-if="$hasPermissions('B_purchaseReturnAdd')" id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
-        <!-- <a-button
-          style="margin-left: 10px"
-          type="primary"
-          class="button-warning"
-          @click="handleExport"
-          :disabled="disabled"
-          :loading="exportLoading"
-        >同步到ERP</a-button> -->
         </div>
         <!-- 列表 -->
         <s-table
@@ -127,13 +119,6 @@
               @click="handleSH(record)"
               v-if="$hasPermissions('B_purchaseReturnRate') && record.state !='WAIT_SUBMIT'"
               id="allocateBillList-examine-btn">审核进度</a-button>
-            <!-- <a-button
-            size="small"
-            type="link"
-            v-if="record.state == 'FINISH'"
-            @click="handleEdit(record)"
-            class="button-info"
-            id="bulkWarehousingOrderList-edit-btn">同步到ERP</a-button> -->
             <a-button
               size="small"
               type="link"