Merge remote-tracking branch 'origin/master'

zkqy-ui/src/views/orderMange/approve.vue

@@ -1220,7 +1220,7 @@ export default {
                     <td>${productName}</td>
                     <td>${productSpecifications}</td>
                     <td>${productType}</td>
-                    <td>${materieEncoding + item.colourNumberLabel}</td>
+                    <td>${item.colours}</td>
                     <td>${item.productNumber}</td>
                     <td>${item.productUnitPrice}</td>
                     <td>${item.productAmounts}</td>

zkqy-ui/src/views/orderMange/codeListManage/printIndex.vue

@@ -302,6 +302,8 @@
                     clearable
                     filterable
                     size="mini"
+                    allow-create
+                    default-first-option
                   >
                     <el-option
                       v-for="item in dropDownData.drum_weight"
@@ -328,6 +330,7 @@
                   </el-input-number>
                 </el-form-item>
               </el-col>
+
               <el-col :span="8">
                 <el-form-item prop="boxWeight" :label="`${tempStr}重`">
                   <el-select
@@ -335,6 +338,8 @@
                     clearable
                     filterable
                     size="mini"
+                    allow-create
+                    default-first-option
                   >
                     <el-option
                       v-for="item in dropDownData.box_weight"
@@ -346,6 +351,8 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+
+
               <el-col :span="8">
                 <el-form-item prop="tubeColor" label="管色">
                   <el-select

zkqy-ui/src/views/orderMange/index.vue

@@ -3552,7 +3552,7 @@ export default {
                     <td>${productSpecifications}</td>
                     <td>${productType}</td>
                     <td>${item.colourNumberLabel}</td>
-                    <td>${item.level}</td>
+                    <td>${item.level?item.level : ""}</td>
                     <td>${item.productNumber}</td>
                     <td>${item.productUnitPrice}</td>
                     <td>${item.productAmounts}</td>

zkqy-ui/src/views/orderMange/productcodelog/index.vue

@@ -9,14 +9,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="批号" prop="lotNum">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.lotNum"-->
-<!--          placeholder="请输入批号"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="批号" prop="lotNum">
+        <el-input
+          v-model="queryParams.lotNum"
+          placeholder="请输入批号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 <!--      <el-form-item label="货品编号" prop="productId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.productId"-->
@@ -25,22 +25,22 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-<!--      <el-form-item label="产品色泽" prop="productColour">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.productColour"-->
-<!--          placeholder="请输入产品色泽"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
-<!--      <el-form-item label="等级" prop="levels">-->
-<!--        <el-input-->
-<!--          v-model="queryParams.levels"-->
-<!--          placeholder="请输入等级"-->
-<!--          clearable-->
-<!--          @keyup.enter.native="handleQuery"-->
-<!--        />-->
-<!--      </el-form-item>-->
+      <el-form-item label="产品色泽" prop="productColour">
+        <el-input
+          v-model="queryParams.productColour"
+          placeholder="请输入产品色泽"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="等级" prop="levels">
+        <el-input
+          v-model="queryParams.levels"
+          placeholder="请输入等级"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
 <!--      <el-form-item label="筒数" prop="canisterNum">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.canisterNum"-->
@@ -339,7 +339,7 @@
       <el-table-column label="修改者编号" align="center" prop="createById" />
       <el-table-column label="修改者名称" align="center" prop="createBy" />
       <el-table-column label="修改时间" align="center" prop="createTime" />
-      <el-table-column label="改前码单" align="center" prop="fatherid" />
+<!--      <el-table-column label="改前码单" align="center" prop="fatherid" />-->
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->