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

package/src/views/wms/page/inner/quality/action/index.vue

@@ -144,23 +144,13 @@
                             </div>-->
 
               <div class="lw-global-row-end lw-global-flex-between">
+
                 <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.action.index.gadtkiox','待检量')"
-                  :value="(i.qty || 0) - (i.qcQty || 0)"
-                  val-bold
-                  :is-row="false"
-                />
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.action.index.ixxggixr','已抽样')"
-                  :value="i.sampleQty || 0"
-                  val-bold
-                  :is-row="false"
-                />
-                <lw-title-value-cell
-                  :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.action.index.veezzaas','已质检')"
-                  :value="i.qcQty || 0"
+                  v-for="(item,index) in i.labeledQtyList"
+                  :key="'lv'+index"
+                  :title="item.fieldCode"
+                  :value="item.qtyLabel || 0"
                   val-bold
-                  val-red
                   :is-row="false"
                 />
               </div>
@@ -183,7 +173,10 @@
 
               <sample-info :item="i"/>
 
-              <div class="lw-global-row-end lw-global-flex-between">
+              <div
+                v-if="i.qcFinishStatus!=='200'"
+                class="lw-global-row-end lw-global-flex-between"
+              >
 
                 <lw-button
                   block
@@ -314,7 +307,26 @@
     >
       <sample-info :item="expendPopup.data"/>
 
+      <!-- 需要sn -->
+      <div
+        v-if="taskData.needHandleSn"
+        class="lw-global-border-2px"
+        style="padding: 5px;border-radius: 5px;margin: 5px 0"
+      >
+        <lw-input
+          :title="$lwLanguage.get('','质检序列号')"
+          v-model="expendPopup.sn.value"
+          :get-focus.sync="expendPopup.sn.focus"
+          rule-key="expendSn"
+          :create-rule="$lwScanRule.create('质检-执行页-样品消耗-序列号','SN')"
+          required
+          auto-clear-val
+          @confirm="(val,{data})=>popupSnConfirm(data,'expendPopup')"
+        />
+        <lw-scan-data-list-module v-model="expendPopup.sn.list"/>
+      </div>
       <lw-input
+        v-else
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.action.index.fdvxiakw','消耗量')"
         v-model="expendPopup.qty.value"
         :get-focus.sync="expendPopup.qty.focus"
@@ -352,7 +364,26 @@
     >
       <sample-info :item="samplePopup.data"/>
 
+      <!-- 需要sn -->
+      <div
+        v-if="taskData.needHandleSn"
+        class="lw-global-border-2px"
+        style="padding: 5px;border-radius: 5px;margin: 5px 0"
+      >
+        <lw-input
+          :title="$lwLanguage.get('','质检序列号')"
+          v-model="samplePopup.sn.value"
+          :get-focus.sync="samplePopup.sn.focus"
+          rule-key="sampleSn"
+          :create-rule="$lwScanRule.create('质检-执行页-样品完成质检-序列号','SN')"
+          required
+          auto-clear-val
+          @confirm="(val,{data})=>popupSnConfirm(data,'samplePopup')"
+        />
+        <lw-scan-data-list-module v-model="samplePopup.sn.list"/>
+      </div>
       <lw-input
+        v-else
         :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.action.index.ervzspgy','质检量')"
         v-model="samplePopup.qty.value"
         :get-focus.sync="samplePopup.qty.focus"
@@ -398,17 +429,36 @@
     >
 
       <div
-        class="lw-global-model-box lw-global-animation-out"
+        class="lw-global-model-box lw-global-animation-out lw-global-model-box-3px"
         v-for="(i,k) in allOrderPopup.data"
         :key="k"
         :style="{animationDelay: 50 * k + 'ms'}"
       >
 
         <sample-info :item="i"/>
-
+        <!-- 需要sn -->
+        <div
+          v-if="taskData.needHandleSn"
+          class="lw-global-border-2px"
+          style="padding: 5px;border-radius: 5px;margin: 5px 0"
+        >
+          <lw-input
+            :title="$lwLanguage.get('','剩余序列号')"
+            v-model="i.sn.value"
+            :get-focus.sync="i.sn.focus"
+            auto-clear-val
+            rule-key="allOrderSn"
+            :create-rule="$lwScanRule.create('质检-执行页-整单完成质检-序列号','SN')"
+            @confirm="(val,{data})=>allOrderPopupSnConfirm(data,i)"
+          />
+          <lw-scan-data-list-module v-model="i.sn.list"/>
+        </div>
+        <!-- 不需要sn -->
         <lw-input
+          v-else
           :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.action.index.lqwvziml','样品剩余量')"
           v-model="i.currentQcQty"
+          :get-focus.sync="i.qtyFocus"
           :show-bottom-border="false"
           required
           type="digit"
@@ -441,7 +491,7 @@ import {
   projectWmsQcGetTaskData,
   projectWmsQcMobileSubmitQc,
   projectWmsQcMobileSubmitSampleUse,
-  projectWmsQcMobileSubmitWholeQc
+  projectWmsQcMobileSubmitWholeQc, projectWmsQcMobileQcCheckSampleSn
 } from "../../../../api/inner/quality/action";
 
 export default {
@@ -481,6 +531,11 @@ export default {
       expendPopup: {
         show: false,
         data: {},
+        sn: {
+          value: '',
+          focus: false,
+          list: []
+        },
         qty: {
           value: '',
           focus: false
@@ -492,6 +547,11 @@ export default {
       samplePopup: {
         show: false,
         data: {},
+        sn: {
+          value: '',
+          focus: false,
+          list: []
+        },
         qty: {
           value: '',
           focus: false
@@ -543,7 +603,8 @@ export default {
         if (this.taskData.qcImages) this.qcImagesList = this.taskData.qcImages.split(';')
       })
     },
-    // 判断任务是否执行完成
+
+    // 公共- 判断任务是否执行完成
     taskOver(res, key, msg) {
       if (res.qcFinishStatus) {
         this.$lwToast.success(
@@ -558,36 +619,76 @@ export default {
       this.getTaskData()
 
     },
-
-
-    // 弹框关闭清空数据
+    // 公共 - 弹框关闭清空数据
     popupOffClearInput(key) {
       this[key].qty.value = ''
+      this[key].sn.value = ''
+      this[key].sn.list = []
       this[key].remark = ''
     },
-    // 打开弹框
+    // 公共 - 打开弹框
     popupOpen(key, item) {
       this[key].data = item
       this[key].show = true
-      this[key].qty.focus = true
+      key !== 'overQcPopup' && this.taskData.needHandleSn ?
+        this[key].sn.focus = true :
+        this[key].qty.focus = true
     },
-    // 数量校验
-    qtyCheck({nullMsg, max = false, errMsg, key}) {
-      const q = Number(this[key].qty.value || 0)
+    // 公共 - 弹框 - 序列号确认
+    popupSnConfirm(data, key) {
+      const sn = data.sn || data.key
+
+      if (!sn) {
+        this[key].sn.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '序列号不能为空')
+        )
+        return
+      }
 
-      if (!q) {
-        this[key].qty.focus = true
-        this.$lwShowErrorMsg(nullMsg)
-        return false
+      // 校验重复
+      if (this[key].sn.list.some(item => item.sn === sn)) {
+        this[key].sn.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '当前序列号已存在扫描统计列表中，不允许重复添加')
+        )
+        return
       }
 
-      if (max === false) return true
+      this[key].sn.focus = false
+      const qty = Number(data.qty || 1)
+      projectWmsQcMobileQcCheckSampleSn({
+        qcOrderId: this.taskData.qcOrderId,
+        qcSampleLineId: this[key].data.qcSampleLineId,
+        sn,
+        qty
+      }).then(res => {
+
+        this[key].sn.list.unshift({
+          sn: res.sn,
+          qty: res.qty || qty
+        })
 
-      const m = Number(max || 0)
-      if (q > m) {
+        this[key].sn.focus = true
+      })
+
+    },
+    // 公共 - 数量校验
+    qtyCheck({nullMsg, key}) {
+      if (key !== 'overQcPopup' && this.taskData.needHandleSn) {
+        if (!this[key].sn.list.length) {
+          this.$lwShowErrorMsg(
+            this.$lwLanguage.get('', '请录入序列号信息')
+          )
+          return false
+        }
+        this[key].qty.value = this[key].sn.list.reduce((t, a) => Number(a.qty) + t, 0)
+      }
+
+      const q = Number(this[key].qty.value || 0)
+      if (!q) {
         this[key].qty.focus = true
-        this.$lwShowErrorMsg(errMsg)
-        this[key].qty.value = ''
+        this.$lwShowErrorMsg(nullMsg)
         return false
       }
 
@@ -644,7 +745,9 @@ export default {
         qcSampleLineId: this.expendPopup.data.qcSampleLineId,
         currentUseQty: this.expendPopup.qty.value,
         remark: this.expendPopup.remark,
-        toLotMap: this.$refs.toLot.getData().data
+        toLotMap: this.$refs.toLot.getData().data,
+        needHandleSn: this.taskData.needHandleSn,
+        snList: this.expendPopup.sn.list
       }).then(res => {
         this.taskOver(
           res,
@@ -656,32 +759,84 @@ export default {
 
     // 样品 - 质检 - 确认
     samplePopupConfirm() {
-
       if (!this.qtyCheck({
         key: 'samplePopup',
         nullMsg: this.$lwLanguage.get('wms_project.pda.components.page.inner.quality.action.index.hvayljex', '质检量不能为空，且应当是大于0的整数'),
       })) return
 
-
       projectWmsQcMobileSubmitSampleQc({
         ...this.taskDataQcInfo(),
         qcSampleLineId: this.samplePopup.data.qcSampleLineId,
         currentQcQty: this.samplePopup.qty.value,
         remark: this.samplePopup.remark,
         toLotMap: this.$refs.toLot.getData().data,
-        lineToLotMap: this.$refs.sampleLot.getData().data
+        lineToLotMap: this.$refs.sampleLot.getData().data,
+        needHandleSn: this.taskData.needHandleSn,
+        snList: this.samplePopup.sn.list
       }).then(res => {
         this.taskOver(
           res,
           'samplePopup',
           this.$lwLanguage.get('wms_project.pda.components.page.inner.quality.action.index.ccnfvnub', '质检成功')
         )
+        this.samplePopup.sn.value = ''
+        this.samplePopup.sn.list = []
       })
     },
 
+    // 整单完成质检 - 序列号确认
+    allOrderPopupSnConfirm(data, item) {
+      const sn = data.sn || data.key
+
+      if (!sn) {
+        item.sn.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '抽样容器【{lpn}】序列号不能为空', {lpn: item.sampleContainer})
+        )
+        return
+      }
+
+      // 校验重复
+      if (item.sn.list.some(item => item.sn === sn)) {
+        item.sn.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '当前序列号已存在扫描统计列表中，不允许重复添加')
+        )
+        return
+      }
+
+      item.sn.focus = false
+      const qty = Number(data.qty || 1)
+      projectWmsQcMobileQcCheckSampleSn({
+        qcOrderId: this.taskData.qcOrderId,
+        qcSampleLineId: item.qcSampleLineId,
+        sn,
+        qty
+      }).then(res => {
+
+        item.sn.list.unshift({
+          sn: res.sn,
+          qty: res.qty || qty
+        })
+
+        item.sn.focus = true
+      })
+    },
     // 整单完成质检
     orderOverQc() {
-      this.allOrderPopup.data = this.taskData.taskSampleList.filter(item => item.qcFinishStatus !== '200')
+      const list = this.taskData.taskSampleList.filter(item => item.qcFinishStatus !== '200')
+      this.allOrderPopup.data = list.map(item => {
+        return {
+          ...item,
+          sn: {
+            value: '',
+            focus: false,
+            list: []
+          },
+          currentQcQty: '',
+          qtyFocus: false
+        }
+      })
       this.allOrderPopup.show = true
     },
     // 整单确认完成质检
@@ -689,16 +844,29 @@ export default {
 
       let qcSampleList = []
       for (const i of this.allOrderPopup.data) {
-        if (isNaN(Number(i.currentQcQty))) {
+        if (this.taskData.needHandleSn) {
+          if (!i.sn.list.length) {
+            i.sn.focus = true
+            this.$lwShowErrorMsg(
+              this.$lwLanguage.get('', '抽样容器【{lpn}】请录入序列号信息', {lpn: i.sampleContainer})
+            )
+            return
+          }
+          i.currentQcQty = i.sn.list.reduce((t, a) => Number(a.qty) + t, 0)
+        }
+
+        if (i.currentQcQty === '') {
+          i.qtyFocus = true
           this.$lwShowErrorMsg(
-            this.$lwLanguage.get('wms_project.pda.components.page.inner.quality.action.index.wcnavocp', '样品剩余量不能为空')
+            this.$lwLanguage.get('', '抽样容器【{lpn}】样品剩余量不能为空', {lpn: i.sampleContainer})
           )
           return;
         }
 
         qcSampleList.push({
           qcSampleLineId: i.qcSampleLineId,
-          currentQcQty: i.currentQcQty
+          currentQcQty: i.currentQcQty,
+          snList: i.sn.list
         })
       }
 
@@ -706,7 +874,8 @@ export default {
         ...this.taskDataQcInfo(),
         qcOrderId: this.taskData.qcOrderId,
         qcSampleList,
-        toLotMap: this.$refs.toLot.getData().data
+        toLotMap: this.$refs.toLot.getData().data,
+        needHandleSn: this.taskData.needHandleSn
       }).then(res => {
         this.taskOver(
           res,
@@ -714,7 +883,7 @@ export default {
           this.$lwLanguage.get('wms_project.pda.components.page.inner.quality.action.index.ccnfvnub', '质检成功')
         )
       })
-    }
+    },
   }
 }
 </script>

package/src/views/wms/page/inner/quality/components/lookData.vue

@@ -53,39 +53,28 @@
           round
           plain
           type="danger"
-        >{{ $lwLanguage.get('wms_project.pda.components.page.inner.quality.components.lookData.vpodlijb','无库存') }}</lw-tag>
+        >{{ $lwLanguage.get('wms_project.pda.components.page.inner.quality.components.lookData.vpodlijb', '无库存') }}
+        </lw-tag>
 
       </lw-sku-info-module>
     </div>
-    <lw-data-look-bg type="not">
-
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.components.lookData.penwftbm','待检量')"
-        :value="item.qty"
-      />
-
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.components.lookData.tufwzsry','抽样比例')"
-        :value="item.sampleRate + '%'"
-      />
-
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.components.lookData.ebkzhcrt','待抽样')"
-        :value="item.waitSampleQty"
-      />
-
-      <lw-data-look-item
-        :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.components.lookData.lcjwczst','已抽样')"
-        :value="item.sampleQty"
-      />
-
-    </lw-data-look-bg>
+    <lw-data-look-bg
+      type="not"
+      :data="item.labeledQtyList"
+      value-key="qtyLabel"
+      title-key="fieldCode"
+      :show-end-line="false"
+      need-show
+    />
     <div class="lw-global-model-bottom-radius">
       <div class="lw-global-title lw-global-row-start lw-global-title-left-line" style="margin-bottom: 10px">
-        {{ $lwLanguage.get('wms_project.pda.components.page.inner.quality.components.lookData.iqjphzzy','原批次信息') }}
+        {{
+          $lwLanguage.get('wms_project.pda.components.page.inner.quality.components.lookData.iqjphzzy', '原批次信息')
+        }}
       </div>
 
       <lw-lot-look-module
+        v-if="item.lotRuleDisplayDTO"
         :columns="item.lotRuleDisplayDTO.items"
       />
     </div>

package/src/views/wms/page/inner/quality/components/sampleInfo.vue

@@ -5,37 +5,35 @@
 -->
 <template>
   <div>
-    <lw-title-value-cell
-      :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.components.sampleInfo.ylgyunuh','抽样容器')"
-      :value="item.sampleContainer"
-      val-bold
-      is-row-start
-    />
-
-    <div class="lw-global-row" style="padding: 0">
-      <lw-data-look-bg type="null">
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.components.sampleInfo.cmsqhdlj','抽样量')"
-          :value="item.qty || 0"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.components.sampleInfo.ghbjwyqc','已消耗')"
-          :value="item.useQty || 0"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.components.sampleInfo.hdnuqkzu','已质检')"
-          :value="item.qcQty || 0"
-        />
-
-        <lw-data-look-item
-          :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.components.sampleInfo.tpgjvowh','待质检')"
-          :value="item.waitQcQty || 0"
-        />
+    <div class="lw-global-row-start lw-global-flex-between">
+      <lw-title-value-cell
+        :title="$lwLanguage.get('wms_project.pda.components.page.inner.quality.components.sampleInfo.ylgyunuh','抽样容器')"
+        :value="item.sampleContainer"
+        val-bold
+        :is-row="false"
+      />
+
+      <lw-tag
+        :type="item.qcFinishStatus==='200'?'success':'primary'"
+        round
+        plain
+      >
+        {{ item.qcFinishStatusLabel }}
+      </lw-tag>
+    </div>
 
-      </lw-data-look-bg>
+    <div
+      :class="item.qcFinishStatus==='200'?'lw-global-row-end':'lw-global-row'"
+      style="padding: 0"
+    >
+      <lw-data-look-bg
+        type="null"
+        :data="item.labeledQtyList"
+        value-key="qtyLabel"
+        title-key="fieldCode"
+        :show-end-line="false"
+        need-show
+      />
     </div>
   </div>
 </template>