1.生产版本详情图片去除删除功能; 2.物料产品管理编码条件筛选交互优化

src/components/ImageUpload/index.vue

@@ -10,14 +10,33 @@
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
       name="file"
-      :on-remove="handleRemove"
       :show-file-list="true"
       :headers="headers"
       :file-list="fileList"
-      :on-preview="handlePictureCardPreview"
       :class="{hide: this.fileList.length >= this.limit}"
     >
       <i class="el-icon-plus"></i>
+      <div slot="file" slot-scope="{file}">
+      <img
+        class="el-upload-list__item-thumbnail"
+        :src="file.url" alt=""
+      >
+      <span class="el-upload-list__item-actions">
+        <span
+          class="el-upload-list__item-preview"
+          @click="handlePictureCardPreview(file)"
+        >
+          <i class="el-icon-zoom-in"></i>
+        </span>
+        <span
+          v-if="isDelShow"
+          class="el-upload-list__item-delete"
+          @click="handleRemove(file)"
+        >
+          <i class="el-icon-delete"></i>
+        </span>
+      </span>
+    </div>
     </el-upload>
 
     <!-- 上传提示 -->
@@ -67,6 +86,10 @@ export default {
     isShowTip: {
       type: Boolean,
       default: true
+    },
+    isDelShow: {
+      type: Boolean,
+      default: true
     }
   },
   data() {

src/views/mes/pro/productionSolution/components/ProogingProcess.vue

@@ -509,8 +509,8 @@ export default {
   ],
   props: {
     bomList: {
-      type: Array,
-      default: () => [],
+      type: Object,
+      default: () => {},
     },
   },
   data() {

src/views/mes/pro/productionSolution/components/ProogingSpecificationSheet.vue

@@ -609,6 +609,7 @@
               :value="form.frontImg"
               fieldName="frontImg"
               :fileSize="5"
+              :isDelShow="false"
               @onUploaded="handleImgUploaded"
               @onRemoved="handleImgRemoved"
             ></ImageUpload>
@@ -621,6 +622,7 @@
               :value="form.backImg"
               fieldName="backImg"
               :fileSize="5"
+              :isDelShow="false"
               @onUploaded="handleImgUploaded"
               @onRemoved="handleImgRemoved"
             ></ImageUpload>

src/views/mes/pro/productionSolution/proofingApply.vue

 <template>
   <div class="app-container">
     <el-form :model="queryParams" @submit.native.prevent ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-      <el-form-item label="成品物料号" prop="sapItemCode">
-        <el-input v-model="queryParams.sapItemCode" placeholder="请输入成品物料号" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="成品物料号" prop="sapItemCodes">
+        <el-input v-model="queryParams.sapItemCodes" placeholder="请输入成品物料号" type="textarea" :rows="2"
+          resize="none" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="成品物名称" prop="itemName">
         <el-input v-model="queryParams.itemName" placeholder="请输入成品物料号" clearable @keyup.enter.native="handleQuery" />
@@ -14,10 +15,9 @@
         <el-input v-model="queryParams.groupCounter" clearable placeholder="请输入组件号" @keyup.enter.native="handleQuery">
         </el-input>
       </el-form-item>
-      <el-form-item label="打样订单号" prop="sapPrototypeMakeCode">
-        <el-input v-model="queryParams.sapPrototypeMakeCode" clearable placeholder="请输入打样订单号"
-          @keyup.enter.native="handleQuery">
-        </el-input>
+      <el-form-item label="打样订单号" prop="sapPrototypeMakeCodes">
+        <el-input v-model="queryParams.sapPrototypeMakeCodes" placeholder="请输入打样订单号" type="textarea" :rows="2"
+          resize="none" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -141,7 +141,7 @@ export default {
         productionSolutionId: null, // 可以查简称与英文名
         productionSolutionCode: null,
         productionSolutionName: null,
-        sapPrototypeMakeCode: null,
+        sapPrototypeMakeCodes: null,
         statsu: "PREPARE",
         itemId: null,
         routeId: null,
@@ -151,6 +151,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        sapItemCodes: null
       },
       options: [
         { value: "PREPARE", label: "待确认" },
@@ -171,6 +172,7 @@ export default {
         //   { required: true, message: "工单编码不能为空", trigger: "blur" }
         // ],
       },
+      productionSolutionList: []
     };
   },
   created() {
@@ -180,7 +182,12 @@ export default {
     /** 查询生产工单列表 */
     getList() {
       this.loading = true;
-      listProductionSolution(this.queryParams).then((response) => {
+      const params = {
+        ...this.queryParams,
+        sapItemCodes: this.queryParams.sapItemCodes ? this.queryParams.sapItemCodes.split(/[\n,;，、；。]/).filter(item => item) : null,
+        sapPrototypeMakeCodes: this.queryParams.sapPrototypeMakeCodes ? this.queryParams.sapPrototypeMakeCodes.split(/[\n,;，、；。]/).filter(item => item) : null
+      }
+      listProductionSolution(params).then((response) => {
         this.productionSolutionList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -197,7 +204,7 @@ export default {
         productionSolutionId: null,
         productionSolutionCode: null,
         productionSolutionName: null,
-        sapPrototypeMakeCode: null,
+        sapPrototypeMakeCodes: null,
         itemId: null,
         routeId: null,
         usageId: null,
@@ -206,6 +213,7 @@ export default {
         createTime: null,
         updateBy: null,
         updateTime: null,
+        sapItemCodes: null
       };
       this.resetForm("form");
     },