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

package/src/views/vin/page/maintain/random/index.vue

@@ -0,0 +1,239 @@
+<!--
+  随机维护 - 起始页
+  @author: 张文
+  @date: 2024-06-20
+-->
+<template>
+  <div>
+    <lw-nav-bar :title="$lwLanguage.get('', '随机维护')"/>
+
+    <lw-page-body-module>
+      <!-- 输入框 -->
+      <div class="lw-global-model-box lw-global-model-box-3px">
+
+        <lw-user-checkbox-module
+          v-model="staff.list"
+          :focus.sync="staff.focus"
+        />
+
+        <lw-cell-search-select-del
+          v-model="type.selected"
+          :title="$lwLanguage.get('', '维护项目')"
+          :columns="type.list"
+          value-key="id"
+          label-key="name"
+          required
+          show-select-count
+          @confirm="maintainItemsConfirm"
+          @del="maintainItemsDel"
+        />
+
+
+        <lw-input
+          :title="$lwLanguage.get('','VIN')"
+          v-model="vin.value"
+          :get-focus.sync="vin.focus"
+          rule-key="vin"
+          :create-rule="$lwScanRule.create('维护管理-随机维护-vin','VIN')"
+          required
+          :show-bottom-border="false"
+          @confirm="vinConfirm"
+        >
+
+          <template #button>
+
+            <lw-button
+              mini
+              round
+              block
+              @click="vinConfirm"
+            >
+              {{ $lwLanguage.get('', '确认') }}
+            </lw-button>
+
+          </template>
+
+        </lw-input>
+
+      </div>
+
+      <!-- 维护项目信息 -->
+      <template v-if="vinInfo.show">
+        <lw-title-value-cell
+          style="margin: 10px 0"
+          :title="$lwLanguage.get('', '当前维护VIN')"
+          :value="vinInfo.vin"
+          val-bold
+          :is-row="false"
+        />
+        <task-action-item
+          v-for="i in vinInfo.maintainItem"
+          :key="i.id"
+          class="lw-global-model-box lw-global-animation-rotate"
+          v-model="i._checkbox"
+          ref="actionItem"
+          :item="i"
+          :show-title-checkbox="false"
+        />
+      </template>
+
+    </lw-page-body-module>
+
+    <lw-bottom-bar v-if="vinInfo.show">
+
+      <lw-button
+        :disabled="!Object.keys(this.vinInfo.maintainItem).length"
+        @click="submitMaintain"
+      >
+        {{ $lwLanguage.get('', '提交维护') }}
+      </lw-button>
+
+    </lw-bottom-bar>
+  </div>
+</template>
+
+<script>
+
+import {
+  wmsVinMobileMaintainGetItemDetails,
+  wmsVinMobileMaintainQueryItemList,
+  wmsVinMobileMaintainSubmitByRandom
+} from "../../../api/maintain/random";
+import taskActionItem from "../components/taskActionItem.vue";
+
+export default {
+  name: "lwVinMaintainRandomIndex",
+  components: {
+    taskActionItem
+  },
+  data() {
+    return {
+      showUser: true,
+      staff: {
+        list: [],
+        focus: false
+      },
+      type: {
+        selected: [],
+        list: [],
+      },
+      typeList: [],
+      vin: {
+        value: '',
+        focus: false
+      },
+      vinInfo: {
+        vin: '',
+        show: false,
+        maintainItem: {}
+      },
+
+    }
+  },
+  mounted() {
+    this.getMaintainList()
+  },
+  methods: {
+    // 获取维护项目列表
+    getMaintainList() {
+      wmsVinMobileMaintainQueryItemList().then(res => {
+        this.type.list = res || []
+      }).catch(() => {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '获取维护项目列表失败，请稍后再试，或联系系统管理员')
+        )
+        history.go(-1)
+      })
+    },
+
+    // 维护项目 - 确定
+    maintainItemsConfirm(list, item) {
+      if (!this.vinInfo.show) {
+        this.vin.focus = true
+        return
+      }
+      wmsVinMobileMaintainGetItemDetails({
+        ids: item ?
+          [item.id] :
+          this.type.selected.filter(item => !this.vinInfo.maintainItem[item.id]).map(item => item.id)
+      }).then(res => {
+        res.forEach(item => {
+          this.vinInfo.maintainItem[item.id] = {
+            ...item,
+            _checkbox: true
+          }
+        })
+        this.$forceUpdate()
+      })
+    },
+    // 维护项目 - 删除
+    maintainItemsDel(item) {
+      delete this.vinInfo.maintainItem[item.id]
+    },
+
+    // vin确认
+    vinConfirm() {
+
+      if (!this.type.list.length) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '维护项目不能为空')
+        )
+        return
+      }
+
+      const vin = this.vin.value
+      if (!vin) {
+        this.vin.focus = true
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', 'VIN不能为空')
+        )
+        return
+      }
+
+      this.vinInfo.vin = vin
+      this.vinInfo.show = true
+      this.maintainItemsConfirm()
+
+    },
+
+    // 提交维护
+    submitMaintain() {
+
+      const staffList = this.staff.list.map(item => item.code)
+      if (!staffList.length) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '员工不能为空')
+        )
+        return
+      }
+
+      const itemList = []
+      const actionItem = this.$refs.actionItem
+      for (const el of actionItem) {
+        const {success, data} = el.getFormData()
+        if (!success) return
+        itemList.push(data)
+      }
+
+
+      wmsVinMobileMaintainSubmitByRandom({
+        staffList,
+        vin: this.vinInfo.vin,
+        itemList
+      }).then(() => {
+        this.$lwToast.success(
+          this.$lwLanguage.get('', '操作成功')
+        )
+        this.vin.value = ''
+        this.vinInfo.show = false
+        this.vinInfo.maintainItem = {}
+        this.vin.focus = true
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/views/vin/page/maintain/recharge/index.vue

@@ -178,7 +178,9 @@ export default {
         itemId: this.type
       }).then(res => {
         this.taskItem.attributeFieldList = res || []
-        this.showTaskItem = true
+        this.$nextTick(() => {
+          this.showTaskItem = true
+        })
       })
     },
 

package/src/views/vin/page/maintain/task/action.vue

@@ -29,7 +29,6 @@
           val-bold
         />
 
-        <!-- TODO 需要修改字段 -->
         <lw-title-value-cell
           :title="$lwLanguage.get('', '所在库位')"
           :value="suggestData.locationCode"

package/src/views/vin/page/outbound/delivery/components/waitItem.vue

@@ -15,7 +15,7 @@
         <template #title>
 
           <div
-            style="font-size: 16px"
+            style="font-size: 1rem"
             class="lw-global-value-bold"
           >
             {{ $lwCheckVal(item.carrierPlateNum) }} / {{ $lwCheckVal(item.carrierName) }}
@@ -72,7 +72,7 @@
 
           <div class="lw-global-flex-between">
             <div
-              style="font-size: 16px"
+              style="font-size: 1rem"
               class="lw-global-value-bold"
             >
               {{ inner.vin }}

package/src/views/vin/page/outbound/keyAllot/action.vue

@@ -94,7 +94,7 @@
               <div class="lw-global-flex-start lw-global-row-start">
                 <img
                   style="width: 30px;margin-right: 5px"
-                  src="../../../../../assets/img/taskOrder.png"
+                  src="../../../../../assets/img/common/taskOrder.png"
                   alt=""
                 >
                 <div class="lw-global-value">

package/src/views/vin/page/outbound/keyAllot/components/overAllotItem.vue

@@ -14,7 +14,7 @@
         <template #title>
 
           <div
-            style="font-size: 16px"
+            style="font-size: 1rem"
             class="lw-global-value-bold"
           >
             {{ $lwCheckVal(item.carrierPlateNum) }} / {{ $lwCheckVal(item.carrierName) }}
@@ -55,7 +55,7 @@
 
           <div class="lw-global-flex-between">
             <div
-              style="font-size: 16px"
+              style="font-size: 1rem"
               class="lw-global-value-bold"
             >
               {{ inner.vin }}

package/src/views/vin/page/outbound/keyAllot/components/waitAllotItem.vue

@@ -7,7 +7,7 @@
   <div class="lw-global-model-box">
 
     <div
-      style="font-size: 16px"
+      style="font-size: 1rem"
       class="lw-global-value-bold"
     >
       {{ $lwCheckVal(item.carrierPlateNum) }} / {{ $lwCheckVal(item.carrierName) }}
@@ -43,7 +43,7 @@
     >
 
       <div
-        style="font-size: 16px"
+        style="font-size: 1rem"
         class="lw-global-value-bold"
       >
         {{ inner.vin }}

package/src/views/vin/page/quality/register/action.vue

@@ -87,6 +87,38 @@
               <vin-info :item="vinData">
 
                 <template>
+                  <div class="lw-global-bottom-border"></div>
+                  <lw-input
+                    :title="$lwLanguage.get('', '公里数(km)')"
+                    v-model="other.mileage"
+                    type="number"
+                    required
+                  />
+
+                  <lw-input
+                    :title="$lwLanguage.get('', '蓄电池电压(V)')"
+                    v-model="other.storageVoltage"
+                    type="number"
+                  />
+
+                  <lw-input
+                    :title="$lwLanguage.get('', '动力电池剩余电量(%)')"
+                    v-model="other.powerBatteryCapacity"
+                    type="number"
+                  />
+
+                  <lw-input
+                    :title="$lwLanguage.get('', '动力电池剩余电量(格)')"
+                    v-model="other.powerBatteryCapacityLevel"
+                    type="number"
+                  />
+
+                  <lw-input
+                    :title="$lwLanguage.get('', '动力电池续航里程(km)')"
+                    v-model="other.powerVoltageEnduranceMileage"
+                    type="number"
+                  />
+
                   <div class="lw-global-title" style="margin-top: 10px">
                     {{ $lwLanguage.get('', '整车照片') }}
                   </div>
@@ -111,7 +143,7 @@
                     <lw-button
                       block
                       round
-                      @click="submitPopup.show = true"
+                      @click="normalSubmitClick"
                     >
                       {{
                         vinData.problemList.length ?
@@ -271,6 +303,14 @@ export default {
         show: false,
         showImg: false,
         imgArr: []
+      },
+
+      other: {
+        mileage: '',
+        storageVoltage: '',
+        powerBatteryCapacity: '',
+        powerBatteryCapacityLevel: '',
+        powerVoltageEnduranceMileage: '',
       }
     }
   },
@@ -284,7 +324,7 @@ export default {
   mounted() {
 
     this.init()
-    const {vin, qualityId} = this.$route.query
+    const {vin, qualityId, other} = this.$route.query
     if (qualityId) {
       this.qualityListClick({qualityId, billStatus: '200'})
     } else if (vin) {
@@ -292,6 +332,11 @@ export default {
       this.vinConfirm()
     }
 
+    const otherData = JSON.parse(other || '{}')
+    if (Object.keys(otherData).length) {
+      this.other = otherData
+    }
+
     this.qualityList.typeList = this.$lwDict.get('VinQualityType') || []
 
     this.getTodayQualityNum()
@@ -332,6 +377,17 @@ export default {
       })
     },
 
+    // 清空数据
+    clearInputData() {
+      this.vinData = {}
+      this.vin.value = ''
+      this.vin.focus = true
+      for (const k in this.other) {
+        this.other[k] = ''
+      }
+      this.imgArr = []
+    },
+
     // vin确认
     vinConfirm() {
 
@@ -344,8 +400,7 @@ export default {
         return
       }
 
-      this.imgArr = []
-      this.vinData = {}
+      this.clearInputData()
 
       this.getDataByVin(vin).then(res => {
         this.vinData = res
@@ -381,7 +436,8 @@ export default {
         path: '/vin/quality/register/lwAction',
         query: {
           ...data,
-          _time: Date.now()
+          _time: Date.now(),
+          other: JSON.stringify(this.other)
         }
       })
 
@@ -413,6 +469,19 @@ export default {
 
     },
 
+    // 正常按钮点击
+    normalSubmitClick() {
+
+      // 检查公里数必填
+      if (!this.other.mileage) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '公里数不能为空')
+        )
+        return
+      }
+      this.submitPopup.show = true
+    },
+
     // 完成质检弹框 - 关闭
     submitPopupOff() {
       this.submitPopup.imgArr = []
@@ -420,6 +489,14 @@ export default {
     },
     // 完成质检弹框 - 确认
     submitPopupConfirm() {
+      // 检查公里数必填
+      if (!this.other.mileage) {
+        this.$lwShowErrorMsg(
+          this.$lwLanguage.get('', '公里数不能为空')
+        )
+        return
+      }
+
       let api = null
       let data = {}
       if (this.vinData.problemList.length) {
@@ -435,17 +512,18 @@ export default {
 
       api({
         ...data,
+        ...this.other,
         qualityId: this.vinData.qualityId,
         images: this.submitPopup.imgArr.join('|'),
-        staffList: this.routerData.staffList
+        staffList: this.routerData.staffList,
       }).then(() => {
         this.$lwToast.success(
           this.$lwLanguage.get('', '操作成功')
         )
-        this.vinData = {}
+
         this.submitPopup.show = false
-        this.vin.value = ''
-        this.vin.focus = true
+
+        this.clearInputData()
         this.getTodayQualityNum()
       })
 
@@ -454,9 +532,8 @@ export default {
     // 质检记录项点击
     qualityListClick({qualityId, billStatus}) {
       if (billStatus !== '200') return
-      this.imgArr = []
-      this.vinData = {}
-      this.vin.value = ''
+
+      this.clearInputData()
       this.getDataByQualityId(qualityId).then(res => {
         this.vinData = res
         this.imgArr = this.vinData.vehicleImages.split('|')

package/src/views/vin/page/quality/register/components/qualityRecordItem.vue

@@ -72,6 +72,46 @@
 
     </div>
 
+    <lw-title-value-cell
+      v-if="item.mileage"
+      :title="$lwLanguage.get('', '公里数(km)')"
+      :value="item.mileage"
+      val-bold
+      :is-row="false"
+    />
+
+    <lw-title-value-cell
+      v-if="item.storageVoltage"
+      :title="$lwLanguage.get('', '蓄电池电压(V)')"
+      :value="item.storageVoltage"
+      val-bold
+      :is-row="false"
+    />
+
+    <lw-title-value-cell
+      v-if="item.powerBatteryCapacity"
+      :title="$lwLanguage.get('', '动力电池剩余电量(%)')"
+      :value="item.powerBatteryCapacity"
+      val-bold
+      :is-row="false"
+    />
+
+    <lw-title-value-cell
+      v-if="item.powerBatteryCapacityLevel"
+      :title="$lwLanguage.get('', '动力电池剩余电量(格)')"
+      :value="item.powerBatteryCapacityLevel"
+      val-bold
+      :is-row="false"
+    />
+
+    <lw-title-value-cell
+      v-if="item.powerVoltageEnduranceMileage"
+      :title="$lwLanguage.get('', '动力电池续航里程(km)')"
+      :value="item.powerVoltageEnduranceMileage"
+      val-bold
+      :is-row="false"
+    />
+
   </div>
 </template>
 

package/src/views/vin/page/quality/register/index.vue

@@ -50,13 +50,14 @@
           :get-focus.sync="owner.focus"
           :create-rule="$lwScanRule.create('质检管理-质检登记-货主','OWNER')"
           rule-key="owner"
+          required
           :api="$lwApi.common.searchOwner"
           @confirm="item=>ownerFactoryPopupConfirm('owner',item)"
           @clear="selectClear('owner')"
         />
 
         <lw-search-select-popup-module
-          title="$lwLanguage.get('','工厂')"
+          :title="$lwLanguage.get('','工厂')"
           v-model="factory.id"
           :get-focus.sync="factory.focus"
           :create-rule="$lwScanRule.create('质检管理-质检登记-工厂','CUSTOMER')"

package/src/views/vin/page/receive/back/index.vue

@@ -160,7 +160,6 @@ export default {
     confirmVin() {
 
       const vin = this.vin.value
-      console.log(vin, 890)
       if (!vin) {
         this.vin.focus = true
         this.$lwShowErrorMsg(

package/src/views/vin/page/receive/scanCar/action.vue

@@ -502,11 +502,11 @@ export default {
     printCheck(needCheck) {
       if (this.printData.printId) return true
 
-      const {printData, success} = this.$lwPrint.test(
-        'VIN_RECEIVE_LABEL',
-        this.$lwLanguage.get('wms_project.pda.vin.page.receive.scanCar.action.ludkueqr', '收车入位'),
-        needCheck
-      )
+      const {printData, success} = this.$lwPrint.test({
+        templateCode: 'VIN_RECEIVE_LABEL',
+        msg: this.$lwLanguage.get('wms_project.pda.vin.page.receive.scanCar.action.ludkueqr', '收车入位'),
+        msgType: needCheck ? 'HARD' : ''
+      })
       this.printData = printData
       return success
     },

package/src/views/vin/views/inner/menu.js

@@ -5,9 +5,12 @@
 * */
 
 import innerImg from "../../../../assets/img/vin/menu/inner/inner.png";
-import move from "../../../../assets/img/vin/menu/inner/move.png";
-import search from "../../../../assets/img/vin/menu/inner/search.png";
-import count from "../../../../assets/img/vin/menu/inner/count.png";
+import moveMaster from "../../../../assets/img/vin/menu/inner/move/master.png";
+import moveSecond from "../../../../assets/img/vin/menu/inner/move/second.png";
+import searchMaster from "../../../../assets/img/vin/menu/inner/search/master.png";
+import searchSecond from "../../../../assets/img/vin/menu/inner/search/second.png";
+import countMaster from "../../../../assets/img/vin/menu/inner/count/master.png";
+import countSecond from "../../../../assets/img/vin/menu/inner/count/second.png";
 
 export const vinInner = {
   src: innerImg,
@@ -20,7 +23,10 @@ export const vinInner = {
 
     // 车辆移位
     move: {
-      src: move,
+      childSrc: {
+        master: moveMaster,
+        second: moveSecond
+      },
       title: '车辆移位',
       titleKey: 'wms_project.pda.vin.menu.vinInner.move',
       tip: 0,
@@ -31,7 +37,10 @@ export const vinInner = {
 
     // 车辆查询
     search: {
-      src: search,
+      childSrc: {
+        master: searchMaster,
+        second: searchSecond
+      },
       title: '车辆查询',
       titleKey: 'wms_project.pda.vin.menu.vinInner.search',
       tip: 0,
@@ -42,7 +51,10 @@ export const vinInner = {
 
     // 车辆盘点
     count: {
-      src: count,
+      childSrc: {
+        master: countMaster,
+        second: countSecond
+      },
       title: '车辆盘点',
       titleKey: 'wms_project.pda.vin.menu.vinInner.count',
       tip: 0,