化纤一揽子修改

zkqy-custom-business/src/main/resources/mapper/business/ProductInventoryMapper.xml

@@ -319,6 +319,7 @@
             '%')
         </if>
         <if test="productId != null">and pi.product_id = #{productId}</if>
+        <if test="productType != null">and p.product_type = #{productType}</if>
         <if test="levels != null and levels != ''">and pi.levels = #{levels}</if>
         GROUP BY
         pi.product_id,

zkqy-ui/src/views/orderMange/components/dialogForm/OutBound.vue

@@ -144,7 +144,6 @@ export default {
         unitName: [
           { required: true, message: "请输入单位名称", trigger: "blur" },
         ],
-        remark: [{ required: true, message: "请输入备注", trigger: "blur" }],
         outStockDate: [
           { required: true, message: "请选择出库日期", trigger: "change" },
         ],
@@ -268,6 +267,7 @@ export default {
     async getTableData(row, isRetail = true) {
       this.resetForm();
       this.row = row;
+      this.form.unitName = row.customName;
       try {
         let payload = {};
         if (isRetail) {

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

@@ -56,6 +56,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="类型" prop="productType">
+        <el-input
+          v-model="queryParams.productType"
+          placeholder="请输入色泽"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="等级" prop="levels">
         <el-select
           v-model="queryParams.levels"
@@ -132,7 +140,7 @@
       <el-table-column label="色泽" align="center" prop="productColor"/>
       <el-table-column label="等级" align="center" prop="levels"/>
       <el-table-column label="箱数" align="center" prop="totalBoxNum"/>
-      <el-table-column label="筒数" align="center" prop="totalCanisterNum"/>
+      <el-table-column label="筒数" align="center" prop="totalCanisterNum" v-if="queryParams.inventoryType ==1"/>
       <el-table-column label="重量" align="center" prop="totalSuttle"/>
 
       <el-table-column label="批号" align="left" prop="lotNum">
@@ -173,6 +181,7 @@ export default {
   // dicts: ["packaging_type"],
   data() {
     return {
+      dbs:0,
       productionOptions: [],
       allProductionOptions: [],
       dropDownData: {}, //等级下拉框数据

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

@@ -180,7 +180,7 @@
                 操作<i class="el-icon-arrow-down el-icon--right"></i>
               </el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item v-show="scope.row.status != 6">
+                <el-dropdown-item>
                   <el-button
                     size="mini"
                     type="text"