@logwire/logwire-wms-pda-ui 3.4.0 → 3.5.0

package/src/views/wms/page/config/masterLocation/masterLocationQuery/index/index.vue

@@ -13,54 +13,59 @@
     <div class="lw-global-page-box">
 
       <lw-tab-box>
-        <van-tabs type="card" animated v-model="tabActive" @change="tabChange">
-          <van-tab name="read" :title="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.index.index.ajemjeoj','商品')">
-            <div class="lw-global-model-box">
-              <lw-input
-
-                v-model="skuCode"
+        <van-tabs
+          type="card"
+          animated
+          v-model="tabActive"
+          @change="tabChange"
+        >
+
+          <van-tab
+            name="sku"
+            :title="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.index.index.ajemjeoj','商品')"
+          >
+            <div class="lw-global-model-box lw-global-model-box-3px">
+
+              <lw-search-select-popup-module
+                :api="$lwApi.common.searchSku"
+                v-model="sku.code"
+                :get-focus.sync="sku.focus"
                 :title="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.index.index.oncweqpo','商品条码')"
-                placeholder="输入商品代码/扫描商品条码"
+                rule-key="sku"
+                :create-rule="$lwScanRule.create('主库位查询-列表页-商品条码','SKU')"
+                :show-border="false"
+                type="sku"
                 @confirm="searchBySkuCode"
-              >
-
-              </lw-input>
-
+              />
 
             </div>
 
-
-
-
           </van-tab>
 
-          <van-tab name="read" :title="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.index.index.riggrlbr','库位')">
+          <van-tab
+            name="location"
+            :title="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.index.index.riggrlbr','库位')"
+          >
 
-            <div class="lw-global-model-box">
+            <div class="lw-global-model-box lw-global-model-box-3px">
               <lw-input
-                v-model="locationCode"
+                v-model="location.code"
+                :get-focus.sync="location.focus"
                 :title="$lwLanguage.get('wms_project.pda.components.page.config.masterLocation.masterLocationQuery.index.index.wogfqlhj','库位编码')"
-                placeholder="输入/扫描库位条码"
+                rule-key="loc"
+                :create-rule="$lwScanRule.create('主库位查询-列表页-商品条码','LOCATION')"
+                :show-bottom-border="false"
                 @confirm="searchByLocationCode"
-              >
-
-              </lw-input>
-
+              />
             </div>
 
           </van-tab>
 
-
         </van-tabs>
       </lw-tab-box>
 
-
-
-
     </div>
 
-
-
   </div>
 </template>
 
@@ -72,37 +77,58 @@ export default {
   components: {},
   data() {
     return {
-      tabActive: '',
-      skuCode:'',
-      locationCode:'',
-
+      tabActive: 'sku',
+      sku: {
+        code: '',
+        focus: false
+      },
+      location: {
+        code: '',
+        focus: false
+      },
     }
   },
-
   mounted() {
-
-
+    this.tabActive = this.$route.query.tab || 'sku'
+    this.tabChange()
   },
   methods: {
+    // tab切换
     tabChange() {
-
+      this.$nextTick(() => this[this.tabActive].focus = true)
     },
-    searchBySkuCode(){
-      let data={
-        "lwSkuCode":this.skuCode
 
-      }
+    // 跳转钱
+    jumpBefore() {
+      this.$router.replace({
+        path: '/config/masterLocation/masterLocationQuery/lwIndex',
+        query: {
+          t: Date.now(),
+          tab: this.tabActive
+        }
+      })
+    },
 
-      this.$router.push({ path: '/config/masterLocation/masterLocationQuery/queryBySkuCode', query:data })
+    searchBySkuCode(item) {
+      this.jumpBefore()
+      this.$router.push({
+        path: '/config/masterLocation/masterLocationQuery/queryBySkuCode',
+        query: {
+          lwSkuId: item.id,
+          lwSkuCode: item.code,
+        }
+      })
 
 
     },
-    searchByLocationCode(){
-      let data={
-        "lwLocationCode":this.locationCode
-
-      }
-      this.$router.push({ path: '/config/masterLocation/masterLocationQuery/queryByLocationCode', query:data })
+    searchByLocationCode() {
+      this.jumpBefore()
+      this.$router.push({
+        path: '/config/masterLocation/masterLocationQuery/queryByLocationCode',
+        query: {
+          lwLocationCode: this.location.code
+        }
+      })
     },
 
   }

package/src/views/wms/page/config/newProject/action/index.vue

@@ -8,36 +8,30 @@
   <div>
 
     <lw-nav-bar
-
       :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.ndcgrluc','商品配置')"/>
 
 
     <div class="lw-global-page-box">
       <div class="lw-global-model-box">
-        <div class="lw-global-row lw-global-flex-between">
-          <div class="lw-global-value-bold">{{ skuNewProjectSkuInfo.skuCode }}</div>
-
-          <div class="lw-tag-box">
-            <lw-tag round plain>{{ $lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.jhfyhldo','BO') }}</lw-tag>
+        <lw-sku-info-module
+          :sku-code="skuNewProjectSkuInfo.skuCode"
+          :sku-name="skuNewProjectSkuInfo.skuName"
+          is-row-first
+        >
+          <lw-tag round plain>
+            {{ $lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.jhfyhldo', 'BO') }}
+          </lw-tag>
+        </lw-sku-info-module>
 
+        <div class="lw-global-row-end lw-global-flex-start">
 
+          <div class="lw-global-title">
+            {{ $lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.adycbvst', '货主') }}
+          </div>
+          <div class="lw-global-value">
+            <span class="lw-global-value-bold">{{ skuNewProjectSkuInfo.ownerCode }}</span>
+            <span>{{ ' / ' + skuNewProjectSkuInfo.ownerName }}</span>
           </div>
-        </div>
-        <div class="lw-global-row">
-
-          <lw-title-value-cell
-            :value="skuNewProjectSkuInfo.skuName"
-            val-bold
-            :is-row="false"
-          />
-
-          <lw-title-value-cell
-            :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.adycbvst','货主')"
-            :value="skuNewProjectSkuInfo.ownerCode + '     ' +  skuNewProjectSkuInfo.ownerName"
-            val-bold
-            :is-row="false"
-          />
-
 
         </div>
 
@@ -60,37 +54,26 @@
                 <lw-input
                   input-align="right"
                   :show-clear="false"
-
                   v-model="skuNewProjectSkuInfo.referCode"
-
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.mqaviyds','参考代码')"
-
-                  :show-bottom-border="false"
                 />
 
                 <lw-cell-popup-radio
                   v-model="skuNewProjectSkuInfo.category"
-
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.yqdnbhlp','商品类型')"
-
-
                   :columns="skuTypeList"
                   value-key="id"
                   label-key="name"
                   @confirm="skuTypeConfirm"
-
                 />
 
 
                 <lw-cell-popup-radio
                   v-model="skuNewProjectSkuInfo.category1"
-
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.blmsvsdj','商品属性')"
-
                   :columns="skuAttributeList"
                   value-key="id"
                   label-key="name"
-
                 />
 
 
@@ -132,7 +115,6 @@
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.bglnknbv','最小销售数')"
 
                   type="number"
-                  :show-bottom-border="false"
                 />
 
 
@@ -154,7 +136,6 @@
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.sytdboif','保质期')"
 
                   type="number"
-                  :show-bottom-border="false"
                 />
                 <lw-input
                   input-align="right"
@@ -165,7 +146,6 @@
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.ppktcufo','最佳保质期')"
 
                   type="number"
-                  :show-bottom-border="false"
                 />
 
                 <lw-input
@@ -177,7 +157,6 @@
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.uatoumzf','剩余效期比例')"
 
                   type="number"
-                  :show-bottom-border="false"
                 />
 
                 <lw-input
@@ -190,7 +169,6 @@
 
                   type="number"
 
-                  :show-bottom-border="false"
                 />
                 <lw-input
                   input-align="right"
@@ -201,7 +179,6 @@
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.vdnplqlw','裸件宽（mm）')"
 
                   type="number"
-                  :show-bottom-border="false"
                 />
 
                 <lw-input
@@ -213,7 +190,6 @@
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.ogquetdf','裸件高（mm）')"
 
                   type="number"
-                  :show-bottom-border="false"
                 />
 
                 <lw-input
@@ -225,7 +201,6 @@
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.ejrshtmz','裸件重量（Kg）')"
 
                   type="number"
-                  :show-bottom-border="false"
                 />
 
                 <lw-cell-popup-radio
@@ -233,7 +208,6 @@
 
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.yqbvoofh','采购收货仓')"
 
-                  :show-bottom-border="false"
                   :columns="warehouseList"
                   value-key="id"
                   label-key="code"
@@ -245,18 +219,15 @@
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.uxbrzqfh','供应类型')"
 
                   dict-key="supply_type_choice"
-                  :show-bottom-border="false"
                 />
 
-                <lw-cell-popup-radio
+                <lw-search-select-popup-module
+                  ref="supplierDom"
+                  :api="querySupplier"
                   v-model="skuNewProjectSkuInfo.supplierId"
-
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.ebaxqqpd','首先供应商')"
-
-                  :columns="supplierList"
-                  value-key="supplierId"
-                  label-key="supplierCode"
-                  :show-bottom-border="false"
+                  input-align="right"
+                  :disabled="!ownerId"
                 />
                 <lw-input
                   input-align="right"
@@ -267,7 +238,6 @@
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.dspghcgw','到货周期')"
 
                   type="number"
-                  :show-bottom-border="false"
                 />
 
                 <lw-cell-popup-radio
@@ -276,7 +246,6 @@
                   :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.ffkwspij','品检方式')"
 
                   dict-key="quality_type_choice"
-                  :show-bottom-border="false"
                 />
 
                 <lw-cell
@@ -678,23 +647,12 @@
             <div v-if="skuNewProjectSkuQualityCardInfoList.length===0"
                  class="lw-global-model-box lw-global-click-style"
             >
-              <div>
-                <lw-cell>
-                  <template #title>
-                    <div>
-                      {{ $lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.tbfybnae','质检方式') }}
-                    </div>
-                  </template>
-                  <template #value>
-                    <div>
-                      {{ $lwDict.getDictLabel('quality_type_choice', skuNewProjectSkuInfo.qualityType) }}
-
-
-                    </div>
-                  </template>
-                </lw-cell>
-              </div>
-              <div class="lw-global-flex-center">
+              <lw-title-value-cell
+                :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.tbfybnae','质检方式')"
+                :value="$lwDict.getDictLabel('quality_type_choice', skuNewProjectSkuInfo.qualityType)"
+                is-row
+              />
+              <div style="margin-top: 10px" class="lw-global-flex-center">
                 <lw-button @click="addQualityCard">添加品检卡</lw-button>
               </div>
             </div>
@@ -704,28 +662,16 @@
                  v-for="(qualityCard,index) in skuNewProjectSkuQualityCardInfoList"
                  :key="'qc'+index"
             >
-              <lw-cell>
-                <template #title>
-                  <div class="lw-global-flex-between">
-                    <div>
-                      {{ $lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.tbfybnae','质检方式') }}
-                    </div>
-                    <div>
-                      {{ $lwDict.getDictLabel('quality_type_choice', skuNewProjectSkuInfo.qualityType) }}
-                    </div>
-                  </div>
-                </template>
-                <template #value>
 
-                  <div class="lw-global-flex-center">
-                    <lw-button @click="qualityCardPopShow(index)">编辑</lw-button>
-                  </div>
-                </template>
-              </lw-cell>
+              <lw-title-value-cell
+                :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.tbfybnae','质检方式')"
+                :value="$lwDict.getDictLabel('quality_type_choice', skuNewProjectSkuInfo.qualityType)"
+                is-row
+              />
 
 
               <div class="lw-global-title" style="padding: 8px 0">
-                {{ $lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.bxopiqkk','正面') }}
+                {{ $lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.bxopiqkk', '正面') }}
               </div>
               <lw-img-look :img-list="qualityCard.frontImage"/>
               <lw-input
@@ -1198,38 +1144,33 @@
     >
 
 
-      <lw-cell>
-        <template #title>
-          <div>
-            {{ $lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.tbfybnae','质检方式') }}
-          </div>
-        </template>
-        <template #value>
-          <div>
-            {{ $lwDict.getDictLabel('quality_type_choice', skuNewProjectSkuInfo.qualityType) }}
-          </div>
-        </template>
-      </lw-cell>
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.tbfybnae','质检方式')"
+        :value="$lwDict.getDictLabel('quality_type_choice', skuNewProjectSkuInfo.qualityType)"
+        is-row
+      />
 
 
       <div class="lw-global-title" style="padding: 8px 0">
-        {{ $lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.bxopiqkk','正面') }}
+        {{ $lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.bxopiqkk', '正面') }}
       </div>
       <lw-img-upload v-model="editSkuQualityInfo.frontImage"/>
-      <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.danjdzch','正面要点')"
-                v-model="editSkuQualityInfo.frontDescribe"
-                type="textarea"
-                input-align="right" :rows="4"/>
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.danjdzch','正面要点')"
+        v-model="editSkuQualityInfo.frontDescribe"
+        type="textarea"
+        input-align="right" :rows="4"/>
       <div class="lw-global-title" style="padding: 8px 0">
-        {{ $lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.gijkqqcc','背面') }}
+        {{ $lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.gijkqqcc', '背面') }}
       </div>
       <lw-img-upload v-model="editSkuQualityInfo.backImage"/>
-      <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.gonfmecc','背面要点')"
-                v-model="editSkuQualityInfo.backDescribe"
-                type="textarea"
-                input-align="right" :rows="4"/>
+      <lw-input
+        :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.gonfmecc','背面要点')"
+        v-model="editSkuQualityInfo.backDescribe"
+        type="textarea"
+        input-align="right" :rows="4"/>
       <div class="lw-global-title" style="padding: 8px 0">
-        {{ $lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.ymurmxsb','特殊') }}
+        {{ $lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.ymurmxsb', '特殊') }}
       </div>
       <lw-img-upload v-model="editSkuQualityInfo.markingImage"/>
       <lw-input :title="$lwLanguage.get('wms_project.pda.components.page.config.newProject.action.index.soqqpnwt','打刻号要点')"
@@ -1246,7 +1187,7 @@
 
       <template #button>
         <lw-bottom-bar>
-          <lw-button @click="saveQualityCard">保存品鉴卡</lw-button>
+          <lw-button @click="saveQualityCard">{{ $lwLanguage.get('', '保存品检卡') }}</lw-button>
         </lw-bottom-bar>
 
       </template>
@@ -1268,7 +1209,6 @@ import {
   WmsProjectMobileSaveSkuBaseInfo,
   WmsProjectMobileSaveSkuPackInfo,
   WmsProjectMobileSaveSkuQualityCardInfo,
-  WmsProjectMobileQuerySupplier,
   WmsProjectMobileSkuNewProjectComplete,
 } from "../../../../api/config/newProject/action"
 
@@ -1319,8 +1259,6 @@ export default {
     })
     this.pageInit()
 
-    console.log()
-
   },
 
   methods: {
@@ -1384,16 +1322,12 @@ export default {
         this.ownerId = lwOwnerId
       }
 
-      console.log("lwSkuId", this.skuId)
-      console.log("lwOwnerId", this.ownerId)
-
 
       WmsProjectMobileQuerySkuNewProductInfo({
         skuId: this.skuId,
         ownerId: this.ownerId,
         "taskId": this.taskId
       }).then(res => {
-        console.log("skuInfo", res)
         if (res.skuNewProjectSkuInfo) {
           this.skuNewProjectSkuInfo = res.skuNewProjectSkuInfo
 
@@ -1417,13 +1351,16 @@ export default {
 
         this.imageLoad = true
 
-        this.querySupplier()
+        this.$nextTick(() => {
+          if (this.skuNewProjectSkuInfo.supplierId) {
+            this.$refs.supplierDom.initEchoData()
+          }
+        })
 
       })
 
 
       WmsProjectMobileQuerySkuAttribute({}).then(res => {
-        console.log("SkuCategory", res)
         if (res && res.length > 0) {
           this.skuTypeList = res
         }
@@ -1431,19 +1368,14 @@ export default {
 
 
       WmsProjectMobileQueryContainerStandard().then(res => {
-        console.log("containerStandardList", res)
         this.containerStandardList = res
       })
 
-      // this.querySupplier()
-
-
     },
 
     skuTypeConfirm() {
       if (this.skuNewProjectSkuInfo.category) {
         WmsProjectMobileQuerySkuCategory({"category": this.skuNewProjectSkuInfo.category}).then(res => {
-          console.log("SkuCategory", res)
           if (res && res.length > 0) {
             this.skuAttributeList = res
           }
@@ -1455,14 +1387,12 @@ export default {
     },
 
     selectContainer(item) {
-      console.log("container", item)
       this.skuNewProjectPackInfoList[this.packInfoShowIndex].code = item.code
 
 
     },
     addQualityCard() {
 
-      console.log("this.skuNewProjectSkuQualityCardInfoList",this.skuNewProjectSkuQualityCardInfoList)
 
       let newQualityCard = {}
 
@@ -1480,8 +1410,7 @@ export default {
 
     saveSkuBaseInfo() {
       let skuBaskInfo = {...this.skuNewProjectSkuInfo}
-      WmsProjectMobileSaveSkuBaseInfo(skuBaskInfo).then(res => {
-        console.log(res)
+      WmsProjectMobileSaveSkuBaseInfo(skuBaskInfo).then(() => {
         this.pageInit()
       })
 
@@ -1497,8 +1426,7 @@ export default {
 
       }
 
-      WmsProjectMobileSaveSkuPackInfo(skuPackInfo).then(res => {
-        console.log(res)
+      WmsProjectMobileSaveSkuPackInfo(skuPackInfo).then(() => {
         this.pageInit()
         this.packInfoPop.show = false
         this.packInfoPop.showCom = false
@@ -1519,8 +1447,7 @@ export default {
 
       }
 
-      WmsProjectMobileSaveSkuQualityCardInfo(skuQualityCardInfo).then(res => {
-        console.log(res)
+      WmsProjectMobileSaveSkuQualityCardInfo(skuQualityCardInfo).then(() => {
         this.pageInit()
       })
 
@@ -1529,11 +1456,11 @@ export default {
 
     },
     querySupplier() {
-      let data = {"ownerId": this.ownerId}
-      WmsProjectMobileQuerySupplier(data).then(res => {
+      return this.$lwApi.common.searchSupplier({ownerId: this.ownerId})
+      /*WmsProjectMobileQuerySupplier(data).then(res => {
         this.supplierList = res
 
-      })
+      })*/
 
     },
     addSkuPack() {
@@ -1558,8 +1485,7 @@ export default {
     },
     complete() {
       let data = {"taskId": this.taskId, "taskNo": this.taskNo}
-      WmsProjectMobileSkuNewProjectComplete(data).then(res => {
-        console.log(res)
+      WmsProjectMobileSkuNewProjectComplete(data).then(() => {
         this.$router.back()
       })
     },