Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/wms/coil/do/correct.vue

@@ -7,7 +7,7 @@
           <div class="section-header">
             <h3 class="section-title">
               查找钢卷并修正
-              <span class="section-desc">绿色边框表示当前钢卷，灰色边框表示历史钢卷</span>
+              <span class="section-desc">绿色边框表示当前钢卷，灰色边框表示历史钢卷, 蓝色边框表示已发货钢卷</span>
             </h3>
 
             <el-button size="mini" icon="el-icon-refresh" @click="getMaterialCoil">刷新</el-button>
@@ -35,12 +35,12 @@
               <i class="el-icon-box"></i>
               <p>暂无待领物料</p>
             </div>
-            <!-- 根据item.dataType决定边框颜色，为0使用当前的颜色，为1使用绿色，为2使用黄色   -->
             <div v-for="(item, index) in materialCoilList" :key="item.coilId || index" class="material-card"
-              :style="item.dataType === 0 ? 'border: 1.5px solid #e4e7ed' : item.dataType === 1 ? 'border: 1.5px solid green' : 'border: 1.5px solid yellow'">
+              :style="getBorderStyle(item)">
               <div class="card-header">
                 <div class="header-left">
                   <el-tag type="info" size="small" class="coil-no-tag">{{ item.currentCoilNo }}</el-tag>
+                  <el-tag type="info" size="small" class="coil-no-tag" :style="getBorderStyle(item)">{{ getTypeLabel(item) }}</el-tag>
                   <span class="material-type">{{ item.materialType || '原料' }}</span>
                   <el-popover v-if="item.rawMaterial || item.product" placement="top" width="280" trigger="hover"
                     popper-class="material-params-popover">
@@ -383,7 +383,7 @@ export default {
         pageNum: 1,
         pageSize: 20,
         // dataType: 1,
-        status: 0,
+        // status: 0,
         enterCoilNo: null,
         currentCoilNo: null
       },
@@ -568,6 +568,41 @@ export default {
   },
   methods: {
     parseTime,
+    getBorderStyle(row) {
+      console.log(row);
+      // 已发货
+      if (row.status == 1) {
+        return {border: '1.5px solid #007bff'}
+      }
+      // 历史钢卷
+      if (row.dataType == 0) {
+        return {border: '1.5px solid #6c757d'}
+      }
+      // 当前钢卷
+      if (row.dataType == 1) {
+        return {border: '1.5px solid #28a745'}
+      }
+      // 还未入库的钢卷
+      if (row.dataType == 10) {
+        return {border: '1.5px solid #ffc107'}
+      }
+      return {border: '1.5px solid #e4e7ed'}
+    },
+    getTypeLabel(row) {
+      if (row.status == 1) {
+        return '已发货'
+      }
+      if (row.dataType == 0) {
+        return '历史钢卷'
+      }
+      if (row.dataType == 1) {
+        return '当前钢卷'
+      }
+      if (row.dataType == 10) {
+        return '还未入库的钢卷'
+      }
+      return '未知'
+    },
     /** 查询用户列表 */
     getUsers() {
       listUser({ pageNum: 1, pageSize: 1000 }).then(response => {

klp-ui/src/views/wms/coil/do/warehousing.vue

@@ -607,9 +607,11 @@ export default {
           handleCoil(COIL_ACTIONS.RECEIVE, this.form, this.form.planId)
             .then(res => {
               this.$modal.msgSuccess("入库成功");
+
               this.form = {
                 itemId: null,
                 itemType: 'raw_material',
+                materialType: '原料',
                 warehouseId: '1988150044862377986', // 酸连轧原料库
                 netWeight: null,
                 grossWeight: null,
@@ -618,8 +620,9 @@ export default {
                 trimmingRequirement: null,
                 packingStatus: null,
                 packagingRequirement: null,
-                planId: this.todayPlanId,
+                planId: this.form.planId,
               }
+              this.getMaxCoilNoByPrefix()
               this.getList()
             }).finally(() => {
               this.buttonLoading = false;
@@ -731,7 +734,7 @@ export default {
       getMaxCoilNo(prefix).then(res => {
         console.log(res)
         // 扣掉最后一位
-        this.form.enterCoilNo = res.data.maxEnterCoilNo.slice(0, -1);
+        this.$set(this.form, 'enterCoilNo', res.data.maxEnterCoilNo.slice(0, -1));
       })
     },
     // 检查钢卷号是否合法（后端检查）