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

klp-ui/src/components/KLPService/Renderer/CoilNo.vue

@@ -30,6 +30,18 @@
           <span class="label">净重：</span>
           <span class="value">{{ netWeight }}</span>
         </div>
+        <div class="info-item" v-if="length">
+          <span class="label">长度：</span>
+          <span class="value">{{ length }}</span>
+        </div>
+        <div class="info-item" v-if="actualLength">
+          <span class="label">实测长度：</span>
+          <span class="value">{{ actualLength }}</span>
+        </div>
+        <div class="info-item" v-if="actualWidth">
+          <span class="label">实测宽度：</span>
+          <span class="value">{{ actualWidth }}</span>
+        </div>
         <div class="info-item">
           <span class="label">厂家卷号：</span>
           <span class="value">{{ supplierCoilNo }}</span>

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

@@ -136,6 +136,14 @@
                             <span class="param-label">长度：</span>
                             <span class="param-value">{{ item.length }}</span>
                           </div>
+                          <div class="param-row" v-if="item.actualLength">
+                            <span class="param-label">实测长度：</span>
+                            <span class="param-value">{{ item.actualLength }}</span>
+                          </div>
+                          <div class="param-row" v-if="item.actualWidth">
+                            <span class="param-label">实测宽度：</span>
+                            <span class="param-value">{{ item.actualWidth }}</span>
+                          </div>
                           <div class="param-row" v-if="item.temperGrade">
                             <span class="param-label">调制度：</span>
                             <span class="param-value">{{ item.temperGrade }}</span>
@@ -332,6 +340,14 @@
         <el-form-item label="长度" prop="length">
           <el-input v-model="form.length" placeholder="请输入长度" />
         </el-form-item>
+        <el-form-item label="实测长度(m)" prop="actualLength">
+          <el-input-number :controls="false" v-model="form.actualLength" placeholder="请输入实测长度" type="number"
+            :step="0.01" />
+        </el-form-item>
+        <el-form-item label="实测宽度(m)" prop="actualWidth">
+          <el-input-number :controls="false" v-model="form.actualWidth" placeholder="请输入实测宽度" type="number"
+            :step="0.01" />
+        </el-form-item>
         <el-form-item label="调制度" prop="temperGrade">
           <el-input v-model="form.temperGrade" placeholder="请输入调制度" />
         </el-form-item>
@@ -626,6 +642,8 @@ export default {
         materialType: '原料',
         temperGrade: undefined,
         coatingType: undefined,
+        actualLength: undefined,
+        actualWidth: undefined,
       };
       this.resetForm("form");
     },

klp-ui/src/views/wms/coil/merge.vue

@@ -189,6 +189,18 @@
                   <template slot="append">米</template>
                 </el-input-number>
               </el-form-item>
+              <el-form-item label="实测长度(m)" prop="actualLength">
+                <el-input-number :controls="false" v-model="targetCoil.actualLength" placeholder="请输入实测长度" type="number"
+                  :step="0.01" :disabled="readonly">
+                  <template slot="append">米</template>
+                </el-input-number>
+              </el-form-item>
+              <el-form-item label="实测宽度(m)" prop="actualWidth">
+                <el-input-number :controls="false" v-model="targetCoil.actualWidth" placeholder="请输入实测宽度" type="number"
+                  :step="0.01" :disabled="readonly">
+                  <template slot="append">米</template>
+                </el-input-number>
+              </el-form-item>
               <el-form-item label="调制度" prop="temperGrade">
                 <el-input v-model="targetCoil.temperGrade" placeholder="请输入调制度" />
               </el-form-item>
@@ -263,6 +275,8 @@ export default {
         length: null,
         temperGrade: '',
         coatingType: '',
+        actualLength: undefined,
+        actualWidth: undefined,
       },
       buttonLoading: false,
       loading: false,

klp-ui/src/views/wms/coil/panels/base.vue

@@ -340,6 +340,14 @@
         <el-form-item label="长度" prop="length" v-if="showLength">
           <el-input v-model="form.length" placeholder="请输入长度" />
         </el-form-item>
+        <el-form-item label="实测长度(m)" prop="actualLength">
+          <el-input-number :controls="false" v-model="form.actualLength" placeholder="请输入实测长度" type="number"
+            :step="0.01" />
+        </el-form-item>
+        <el-form-item label="实测宽度(m)" prop="actualWidth">
+          <el-input-number :controls="false" v-model="form.actualWidth" placeholder="请输入实测宽度" type="number"
+            :step="0.01" />
+        </el-form-item>
         <el-form-item label="调制度" prop="temperGrade">
           <el-input v-model="form.temperGrade" placeholder="请输入调制度" />
         </el-form-item>
@@ -705,7 +713,9 @@ export default {
           { label: '包装要求', prop: 'packagingRequirement' },
           { label: '厂家', prop: 'itemManufacturer' },
           { label: '调制度', prop: 'temperGrade' },
-          { label: '镀层种类', prop: 'coatingType' }
+          { label: '镀层种类', prop: 'coatingType' },
+          { label: '实测长度(m)', prop: 'actualLength' },
+          { label: '实测宽度(m)', prop: 'actualWidth' },
         ],
         title: '详细信息'
       },

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

@@ -135,6 +135,14 @@
                             <span class="param-label">长度：</span>
                             <span class="param-value">{{ item.length }}米</span>
                           </div>
+                          <div class="param-row" v-if="item.actualLength">
+                            <span class="param-label">实测长度：</span>
+                            <span class="param-value">{{ item.actualLength }}米</span>
+                          </div>
+                          <div class="param-row" v-if="item.actualWidth">
+                            <span class="param-label">实测宽度：</span>
+                            <span class="param-value">{{ item.actualWidth }}米</span>
+                          </div>
                           <div class="param-row" v-if="item.temperGrade">
                             <span class="param-label">调制度：</span>
                             <span class="param-value">{{ item.temperGrade }}</span>

klp-ui/src/views/wms/coil/panels/stepSplit.vue

@@ -135,6 +135,14 @@
               <el-form-item label="长度" prop="length">
                 <el-input v-model="splitForm.length" placeholder="请输入长度" type="number" />
               </el-form-item>
+              <el-form-item label="实测长度(m)" prop="actualLength">
+                <el-input-number :controls="false" v-model="splitForm.actualLength" placeholder="请输入实测长度" type="number"
+                  :step="0.01" />
+              </el-form-item>
+              <el-form-item label="实测宽度(m)" prop="actualWidth">
+                <el-input-number :controls="false" v-model="splitForm.actualWidth" placeholder="请输入实测宽度" type="number"
+                  :step="0.01" />
+              </el-form-item>
               <el-form-item label="调制度" prop="temperGrade">
                 <el-input v-model="splitForm.temperGrade" placeholder="请输入调制度" />
               </el-form-item>
@@ -251,6 +259,8 @@ export default {
         grossWeight: '',
         netWeight: '',
         length: '',
+        actualLength: '',
+        actualWidth: '',
         temperGrade: '',
         coatingType: '',
         remark: '',

klp-ui/src/views/wms/coil/split.vue

@@ -193,6 +193,18 @@
                     <template slot="append">米</template>
                   </el-input-number>
                 </el-form-item>
+                <el-form-item label="实测长度(m)" prop="actualLength">
+                  <el-input-number :controls="false" v-model="item.actualLength" placeholder="请输入实测长度" type="number"
+                    :step="0.01" :disabled="readonly">
+                    <template slot="append">米</template>
+                  </el-input-number>
+                </el-form-item>
+                <el-form-item label="实测宽度(m)" prop="actualWidth">
+                  <el-input-number :controls="false" v-model="item.actualWidth" placeholder="请输入实测宽度" type="number"
+                    :step="0.01" :disabled="readonly">
+                    <template slot="append">米</template>
+                  </el-input-number>
+                </el-form-item>
                 <el-form-item label="调制度" prop="temperGrade">
                   <el-input v-model="item.temperGrade" placeholder="请输入调制度" />
                 </el-form-item>
@@ -275,6 +287,8 @@ export default {
           length: undefined,
           temperGrade: '',
           coatingType: '',
+          actualLength: undefined,
+          actualWidth: undefined,
         }
       ],
       loading: false,
@@ -459,6 +473,8 @@ export default {
         trimmingRequirement: '',
         temperGrade: '',
         coatingType: '',
+        actualLength: undefined,
+        actualWidth: undefined,
       });
     },
 

klp-ui/src/views/wms/coil/typing.vue

@@ -157,14 +157,21 @@
 
             <el-form-item label="净重(t)" prop="netWeight">
               <el-input-number :precision="3" :controls="false" v-model="updateForm.netWeight" placeholder="请输入净重"
-                type="number" :step="0.01">
+                type="number" :step="0.001">
                 <template slot="append">吨</template>
               </el-input-number>
             </el-form-item>
 
-            <el-form-item label="长度(m)" prop="length">
+            <el-form-item label="实测长度(m)" prop="actualLength">
-              <el-input-number :controls="false" v-model="updateForm.length" placeholder="请输入长度" type="number"
+              <el-input-number :controls="false" v-model="updateForm.actualLength" placeholder="请输入实测长度" type="number"
-                :step="0.01">
+                :step="0.001">
+                <template slot="append">米</template>
+              </el-input-number>
+            </el-form-item>
+
+             <el-form-item label="实测宽度(m)" prop="actualWidth">
+              <el-input-number :controls="false" v-model="updateForm.actualWidth" placeholder="请输入实测宽度" type="number"
+                :step="0.001">
                 <template slot="append">米</template>
               </el-input-number>
             </el-form-item>
@@ -283,6 +290,8 @@ export default {
         length: undefined,
         temperGrade: '',
         coatingType: '',
+        actualLength: undefined,
+        actualWidth: undefined,
       },
       rules: {
         currentCoilNo: [