Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

feat(钢卷管理): 为镀层种类字段添加记忆输入功能
在多个钢卷管理相关页面中，将镀层种类输入框从普通输入框替换为MemoInput组件，并添加对应的storageKey到enum.js中
2026-03-04 09:07:53 +08:00 · 2026-03-04 09:07:49 +08:00 · 2026-03-03 17:36:18 +08:00
15 changed files with 49 additions and 31 deletions
--- a/klp-ui/src/components/KLPService/ProductSelect/index.vue
+++ b/klp-ui/src/components/KLPService/ProductSelect/index.vue
@@ -103,35 +103,34 @@
        </el-form-item> -->

        <el-form-item label="产品名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入产品名称" />
+          <MemoInput storageKey="productName" v-model="form.productName" placeholder="请输入产品名称" />
        </el-form-item>

        <!-- <el-form-item label="负责人" prop="owner">
          <el-input v-model="form.owner" :multiple="false" placeholder="请填写负责人" />
        </el-form-item> -->

-        <el-form-item label="计量单位" prop="unit">
+        <!-- <el-form-item label="计量单位" prop="unit">
          <el-input v-model="form.unit" placeholder="请输入计量单位" />
-        </el-form-item>
+        </el-form-item> -->

        <el-form-item label="规格" prop="specification">
-          <el-input v-model="form.specification" placeholder="请输入规格" />
+          <MemoInput storageKey="coilSpec" v-model="form.specification" placeholder="请输入规格" />
        </el-form-item>
-
        <el-form-item label="材质" prop="material">
-          <el-input v-model="form.material" placeholder="请输入材质" />
+          <MemoInput storageKey="material" v-model="form.material" placeholder="请输入材质" />
        </el-form-item>

        <el-form-item label="厂家" prop="manufacturer">
-          <el-input v-model="form.manufacturer" placeholder="请输入厂家" />
+          <MemoInput storageKey="manufacturer" v-model="form.manufacturer" placeholder="请输入厂家" />
        </el-form-item>

        <el-form-item label="表面处理" prop="surfaceTreatmentDesc">
-          <el-input v-model="form.surfaceTreatmentDesc" placeholder="请输入表面处理" />
+          <MemoInput storageKey="surfaceTreatmentDesc" v-model="form.surfaceTreatmentDesc" placeholder="请输入表面处理" />
        </el-form-item>

        <el-form-item label="镀层质量" prop="zincLayer">
-          <el-input v-model="form.zincLayer" placeholder="请输入镀层质量" />
+          <MemoInput storageKey="zincLayer" v-model="form.zincLayer" placeholder="请输入镀层质量" />
        </el-form-item>

      </el-form>
@@ -359,6 +358,7 @@ export default {
          } else {
            addProduct({
              ...this.form,
+              unit: '卷',
              productCode: this.form.material || '' + (this.form.zincLayer || '') + new Date().getTime(),
            }).then(response => {
              this.$modal.msgSuccess("新增成功");
--- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
+++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
@@ -98,28 +98,25 @@
          <el-input v-model="form.rawMaterialCode" placeholder="请输入原材料编号" />
        </el-form-item> -->
        <el-form-item label="原材料名称" prop="rawMaterialName">
-          <el-input v-model="form.rawMaterialName" placeholder="请输入原材料名称" />
+          <MemoInput storageKey="productName" v-model="form.rawMaterialName" placeholder="请输入原材料名称" />
        </el-form-item>
        <el-form-item label="规格" prop="specification">
-          <el-input v-model="form.specification" placeholder="请输入规格" />
+          <MemoInput storageKey="coilSpec" v-model="form.specification" placeholder="请输入规格" />
        </el-form-item>
-        <el-form-item label="计量单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入计量单位" />
-        </el-form-item>
-          <el-form-item label="材质" prop="material">
-          <el-input v-model="form.material" placeholder="请输入材质" />
+        <el-form-item label="材质" prop="material">
+          <MemoInput storageKey="material" v-model="form.material" placeholder="请输入材质" />
        </el-form-item>

        <el-form-item label="厂家" prop="manufacturer">
-          <el-input v-model="form.manufacturer" placeholder="请输入厂家" />
+          <MemoInput storageKey="manufacturer" v-model="form.manufacturer" placeholder="请输入厂家" />
        </el-form-item>

        <el-form-item label="表面处理" prop="surfaceTreatmentDesc">
-          <el-input v-model="form.surfaceTreatmentDesc" placeholder="请输入表面处理" />
+          <MemoInput storageKey="surfaceTreatmentDesc" v-model="form.surfaceTreatmentDesc" placeholder="请输入表面处理" />
        </el-form-item>

        <el-form-item label="镀层质量" prop="zincLayer">
-          <el-input v-model="form.zincLayer" placeholder="请输入镀层质量" />
+          <MemoInput storageKey="zincLayer" v-model="form.zincLayer" placeholder="请输入镀层质量" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
@@ -316,6 +313,7 @@ export default {
          } else {
            addRawMaterial({
              ...this.form,
+              unit: '卷',
              rawMaterialCode: this.form.material || '' + (this.form.zincLayer || '') + new Date().getTime(),
            }).then(response => {
              this.$modal.msgSuccess("新增成功");
--- a/klp-ui/src/components/KLPService/Renderer/CoilNo.vue
+++ b/klp-ui/src/components/KLPService/Renderer/CoilNo.vue
@@ -26,6 +26,14 @@
            {{ specification }}
          </span>
        </div>
+        <div class="info-item">
+          <span class="label">净重：</span>
+          <span class="value">{{ netWeight }}</span>
+        </div>
+        <div class="info-item">
+          <span class="label">厂家卷号：</span>
+          <span class="value">{{ supplierCoilNo }}</span>
+        </div>
      </div>
      
      <el-tag type="info" size="small" slot="reference">{{ currentCoilNo }}</el-tag>
@@ -73,6 +81,12 @@ export default {
    },
    currentCoilNo() {
      return this.coilNo || this.coilInfo?.currentCoilNo || '-'
+    },
+    netWeight() {
+      return this.coilInfo.netWeight || '-'
+    },
+    supplierCoilNo() {
+      return this.coilInfo.supplierCoilNo || '-'
    }
  },
  methods: {
--- a/klp-ui/src/main.js
+++ b/klp-ui/src/main.js
@@ -45,6 +45,9 @@ import VueMeta from 'vue-meta'
 // 字典数据组件
 import DictData from '@/components/DictData'
 import KLPTable from '@/components/KLPUI/KLPTable/index.vue'
+import MemoInput from '@/components/MemoInput/index.vue'
+
+

 // 全局方法挂载
 Vue.prototype.getDicts = getDicts
@@ -68,6 +71,7 @@ Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
 Vue.component('KLPTable', KLPTable)
+Vue.component('MemoInput', MemoInput)

 Vue.use(vueFlvPlayer)
 Vue.use(directive)
--- a/klp-ui/src/utils/enum.js
+++ b/klp-ui/src/utils/enum.js
@@ -11,4 +11,5 @@ export const MemoInputStorageKey = {
  packingStatus: 'packingStatus', // 打包状态
  packagingRequirement: 'packagingRequirement', // 打包要求
  coilSpec: 'coilSpec', // 钢卷规格
+  coatingType: 'coatingType', // 钢卷镀层种类
 }
--- a/klp-ui/src/views/wms/coil/do/correct.vue
+++ b/klp-ui/src/views/wms/coil/do/correct.vue
@@ -335,7 +335,7 @@
          <el-input v-model="form.temperGrade" placeholder="请输入调制度" />
        </el-form-item>
        <el-form-item label="镀层种类" prop="coatingType">
-          <el-input v-model="form.coatingType" placeholder="请输入镀层种类" />
+          <MemoInput storageKey="coatingType" v-model="form.coatingType" placeholder="请输入镀层种类" />
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -592,7 +592,7 @@ export default {
  methods: {
    parseTime,
    getBorderStyle(row) {
-      console.log(row);
+      // console.log(row);
      // 已发货
      if (row.status == 1) {
        return { border: '1.5px solid #007bff' }
--- a/klp-ui/src/views/wms/coil/do/packing.vue
+++ b/klp-ui/src/views/wms/coil/do/packing.vue
@@ -135,7 +135,7 @@
              </el-col>
              <el-col :span="12">
                <el-form-item label="镀层种类" prop="coatingType">
-                  <el-input v-model="form.coatingType" placeholder="请输入镀层种类" />
+                  <MemoInput storageKey="coatingType" v-model="form.coatingType" placeholder="请输入镀层种类" />
                </el-form-item>
              </el-col>
              <el-col :span="24">
--- a/klp-ui/src/views/wms/coil/do/search.vue
+++ b/klp-ui/src/views/wms/coil/do/search.vue
@@ -133,7 +133,7 @@
              </el-col>
              <el-col :span="12">
                <el-form-item label="镀层种类" prop="coatingType">
-                  <el-input v-model="form.coatingType" placeholder="请输入镀层种类" />
+                  <MemoInput storageKey="coatingType" v-model="form.coatingType" placeholder="请输入镀层种类" />
                </el-form-item>
              </el-col>
              <el-col :span="24">
--- a/klp-ui/src/views/wms/coil/do/ship.vue
+++ b/klp-ui/src/views/wms/coil/do/ship.vue
@@ -124,7 +124,7 @@
              </el-col>
              <el-col :span="12">
                <el-form-item label="镀层种类" prop="coatingType">
-                  <el-input v-model="form.coatingType" placeholder="请输入镀层种类" />
+                  <MemoInput storageKey="coatingType" v-model="form.coatingType" placeholder="请输入镀层种类" />
                </el-form-item>
              </el-col>
              <el-col :span="24">
--- a/klp-ui/src/views/wms/coil/do/warehousing.vue
+++ b/klp-ui/src/views/wms/coil/do/warehousing.vue
@@ -115,7 +115,7 @@
              </el-col>
              <el-col :span="24">
                <el-form-item label="镀层种类" prop="coatingType">
-                  <el-input v-model="form.coatingType" placeholder="请输入镀层种类" />
+                  <MemoInput storageKey="coatingType" v-model="form.coatingType" placeholder="请输入镀层种类" />
                </el-form-item>
              </el-col>
              <el-col :span="24">
@@ -326,7 +326,7 @@
          <el-input v-model="editCoil.form.temperGrade" placeholder="请输入调制度" />
        </el-form-item>
        <el-form-item label="镀层种类" prop="coatingType">
-          <el-input v-model="editCoil.form.coatingType" placeholder="请输入镀层种类" />
+          <MemoInput storageKey="coatingType" v-model="editCoil.form.coatingType" placeholder="请输入镀层种类" />
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="editCoil.form.remark" placeholder="请输入备注" />
--- a/klp-ui/src/views/wms/coil/merge.vue
+++ b/klp-ui/src/views/wms/coil/merge.vue
@@ -192,7 +192,7 @@
                <el-input v-model="targetCoil.temperGrade" placeholder="请输入调制度" />
              </el-form-item>
              <el-form-item label="镀层种类" prop="coatingType">
-                <el-input v-model="targetCoil.coatingType" placeholder="请输入镀层种类" />
+                <MemoInput storageKey="coatingType" v-model="targetCoil.coatingType" placeholder="请输入镀层种类" />
              </el-form-item>
              <el-form-item label="逻辑库区">
                <WarehouseSelect v-model="targetCoil.warehouseId" placeholder="请选择逻辑库区" :disabled="readonly" />
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -275,7 +275,7 @@
          <el-input v-model="form.temperGrade" placeholder="请输入调制度" />
        </el-form-item>
        <el-form-item label="镀层种类" prop="coatingType">
-          <el-input v-model="form.coatingType" placeholder="请输入镀层种类" />
+          <MemoInput storageKey="coatingType" v-model="form.coatingType" placeholder="请输入镀层种类" />
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" placeholder="请输入备注" />
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -38,6 +38,7 @@
            highlight-current-row border stripe>
            <el-table-column prop="currentCoilNo" label="当前钢卷号" />
            <el-table-column prop="materialType" label="材料类型" />
+            <el-table-column prop="netWeight" label="净重" />
            <el-table-column prop="dataType" label="钢卷状态">
              <template #default="scope">
                <div v-if="scope.row.status == 1">
@@ -137,7 +138,7 @@
                <el-input v-model="splitForm.temperGrade" placeholder="请输入调制度" />
              </el-form-item>
              <el-form-item label="镀层种类" prop="coatingType">
-                <el-input v-model="splitForm.coatingType" placeholder="请输入镀层种类" />
+                <MemoInput storageKey="coatingType" v-model="splitForm.coatingType" placeholder="请输入镀层种类" />
              </el-form-item>
              <el-form-item label="备注" prop="remark">
                <el-input v-model="splitForm.remark" placeholder="请输入备注" type="textarea" />
--- a/klp-ui/src/views/wms/coil/split.vue
+++ b/klp-ui/src/views/wms/coil/split.vue
@@ -196,7 +196,7 @@
                  <el-input v-model="item.temperGrade" placeholder="请输入调制度" />
                </el-form-item>
                <el-form-item label="镀层种类" prop="coatingType">
-                  <el-input v-model="item.coatingType" placeholder="请输入镀层种类" />
+                  <MemoInput storageKey="coatingType" v-model="item.coatingType" placeholder="请输入镀层种类" />
                </el-form-item>
                <el-form-item label="逻辑库区" required>
                  <WarehouseSelect v-model="item.warehouseId" placeholder="请选择逻辑库区" :disabled="readonly" />
--- a/klp-ui/src/views/wms/coil/typing.vue
+++ b/klp-ui/src/views/wms/coil/typing.vue
@@ -173,7 +173,7 @@
            </el-form-item>

            <el-form-item label="镀层种类" prop="coatingType">
-              <el-input v-model="updateForm.coatingType" placeholder="请输入镀层种类" />
+              <MemoInput storageKey="coatingType" v-model="updateForm.coatingType" placeholder="请输入镀层种类" />
            </el-form-item>

            <el-form-item label="逻辑库区" prop="warehouseId">