fix: 1.用户管理增加批量工作单元选择操作; 2.生产工单, 排产, 报工增加查询条件

src/i18n/lang/th_TH.json

@@ -229,6 +229,7 @@
 	"工艺路线选择": "เลือกเส้นทางการผลิต",
 	"成品物料号": "รหัสวัสดุสำเร็จรูป",
 	"成品物名称": "ชื่อวัสดุสำเร็จรูป",
+	"产品图号": "หมายเลขแผนภาพผลิตภัณฑ์",
 	"打样订单号": "หมายเลขใบสั่งตัวอย่าง",
 	"生产版本编码": "รหัสรุ่นผลิต",
 	"产品版本名称": "ชื่อเวอร์ชันผลิตภัณฑ์",

src/i18n/lang/zh_CN.json

@@ -229,6 +229,7 @@
 	"工艺路线选择": "工艺路线选择",
 	"成品物料号": "成品物料号",
 	"成品物名称": "成品物名称",
+	"产品图号": "产品图号",
 	"打样订单号": "打样订单号",
 	"生产版本编码": "生产版本编码",
 	"产品版本名称": "产品版本名称",

src/views/mes/pro/feedback/index.vue

@@ -26,6 +26,15 @@
       <el-form-item :label="$t('产品物料名称')" prop="itemName">
         <el-input v-model="queryParams.itemName" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item :label="$t('产品图号')" prop="customerDrawingNo">
+        <el-input v-model="queryParams.customerDrawingNo" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item :label="$t('销售订单号')" prop="orderCode">
+        <el-input v-model="queryParams.orderCode" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item :label="$t('序号')" prop="orderSerial">
+        <el-input v-model="queryParams.orderSerial" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item :label="$t('报工人')" prop="nickName">
         <el-input v-model="queryParams.nickName" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -67,6 +76,9 @@
       <el-table-column :label="$t('common.workunit')" width="120" align="center" prop="workunitName" />
       <el-table-column :label="$t('外协单号')" width="150" align="center" prop="assistProcessCode" />
       <el-table-column :label="$t('生产工单编号')" width="150" align="center" prop="workorderCode" />
+      <el-table-column :label="$t('产品图号')" width="150" align="center" prop="customerDrawingNo" />
+      <el-table-column :label="$t('销售订单号')" width="150" align="center" prop="orderCode" />
+      <el-table-column :label="$t('序号')" width="150" align="center" prop="orderSerial" />
       <el-table-column :label="$t('产品物料编码')" width="120" align="center" prop="itemCode" />
       <el-table-column :label="$t('产品物料名称')" min-width="250" show-overflow-tooltip align="center" prop="itemName" />
       <el-table-column :label="$t('规格型号')" width="100" align="center" prop="specification" />
@@ -292,6 +304,9 @@ export default {
         itemCode: null,
         itemCode: null,
         itemName: null,
+        customerDrawingNo: null,
+        orderCode: null,
+        orderSerial: null,
         unitOfMeasure: null,
         specification: null,
         quantity: null,

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

@@ -7,6 +7,10 @@
       <el-form-item :label="$t('成品物名称')" prop="itemName">
         <el-input v-model="queryParams.itemName" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
+      <el-form-item :label="$t('产品图号')" prop="customerDrawingNo">
+        <el-input v-model="queryParams.customerDrawingNo" clearable @keyup.enter.native="handleQuery">
+        </el-input>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('common.search') }}</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('common.reset') }}</el-button>
@@ -28,6 +32,7 @@
       <el-table-column :label="$t('产品版本名称')" align="center" prop="productionSolutionName" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('成品物料编码')" align="center" prop="itemCode" />
       <el-table-column :label="$t('成品物料名称')" align="center" prop="itemName" />
+      <el-table-column :label="$t('产品图号')" align="center" prop="customerDrawingNo" />
       <el-table-column :label="$t('创建人')" align="center" prop="createBy" />
       <el-table-column :label="$t('创建时间')" align="center" prop="createTime" />
       <el-table-column :label="$t('修改人')" align="center" prop="updateBy" />
@@ -136,6 +141,7 @@ export default {
         productionSolutionName: null,
         statsu: "PREPARE",
         itemId: null,
+        customerDrawingNo: null,
         routeId: null,
         usageId: null,
         remark: null,

src/views/mes/pro/scheduleList/index.vue

@@ -100,7 +100,41 @@
           <el-form-item :label="$t('订单号')" prop="orderCode">
             <el-input
               v-model="queryParams.orderCode"
-
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item :label="$t('产品编号')" prop="productCode">
+            <el-input
+              v-model="queryParams.productCode"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item :label="$t('产品图号')" prop="customerDrawingNo">
+            <el-input
+              v-model="queryParams.customerDrawingNo"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item :label="$t('销售订单号')" prop="orderCode">
+            <el-input
+              v-model="queryParams.orderCode"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item :label="$t('序号')" prop="orderSerial">
+            <el-input
+              v-model="queryParams.orderSerial"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item :label="$t('名称')" prop="itemName">
+            <el-input
+              v-model="queryParams.itemName"
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -217,6 +251,7 @@
         prop="processName"
         :show-overflow-tooltip="true"
       />
+      <el-table-column :label="$t('产品图号')" align="center" prop="customerDrawingNo" />
       <el-table-column :label="$t('排产数量')" align="center" prop="quantity" />
       <el-table-column :label="$t('可加工数量')" align="center" prop="quantityWait"/>
       <el-table-column :label="$t('已完成数量')" align="center" prop="quantityQualify" />
@@ -623,6 +658,11 @@ export default {
         processName: null,
         customerProjectNo: null,
         orderCode: null,
+        productCode: null,
+        customerDrawingNo: null,
+        orderCode: null,
+        orderSerial: null,
+        itemName: null,
         statusArr: ['PREPARE'],
         scheduleStartDate: null,
         scheduleEndDate: null,

src/views/mes/pro/scheduleList/orderList.vue

@@ -12,7 +12,6 @@
       <el-form-item :label="$t('产品编码')" prop="productCode">
         <el-input
           v-model="queryParams.productCode"
-
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -20,7 +19,13 @@
       <el-form-item :label="$t('产品名称')" prop="productName">
         <el-input
           v-model="queryParams.productName"
-
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('产品图号')" prop="customerDrawingNo">
+        <el-input
+          v-model="queryParams.customerDrawingNo"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -36,7 +41,6 @@
       <el-form-item :label="$t('订单号')" prop="orderCode">
         <el-input
           v-model="queryParams.orderCode"
-
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -44,7 +48,6 @@
       <el-form-item :label="$t('订单项次')" prop="orderSerial">
         <el-input
           v-model="queryParams.orderSerial"
-
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -151,6 +154,7 @@ export default {
         pageSize: 50,
         workorderCode: '',
         productCode: '',
+        customerDrawingNo: '',
         productName: '',
         customerProjectNo: '',
         orderCode: '',

src/views/mes/pro/workorder/indexApply.vue

@@ -60,11 +60,37 @@
           </el-option>
         </el-select>
       </el-form-item>
-
-      <el-form-item label="项目号" prop="customerProjectNo">
+      <el-form-item :label="$t('项目号')" prop="customerProjectNo">
         <el-input
           v-model="queryParams.customerProjectNo"
-
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('产品编号')" prop="productCode">
+        <el-input
+          v-model="queryParams.productCode"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('产品图号')" prop="customerDrawingNo">
+        <el-input
+          v-model="queryParams.customerDrawingNo"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('销售订单号')" prop="orderCode">
+        <el-input
+          v-model="queryParams.orderCode"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="$t('序号')" prop="orderSerial">
+        <el-input
+          v-model="queryParams.orderSerial"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -195,6 +221,7 @@
       <el-table-column :label="$t('客户图号')" width="140" align="center" prop="customerDrawingNo" />
       <el-table-column :label="$t('客户项目号')" width="140" align="center" prop="customerProjectNo" />
       <el-table-column :label="$t('内部图号')" width="140" align="center" prop="inDrawingNo" />
+      <el-table-column :label="$t('产品图号')" width="140" align="center" prop="customerDrawingNo" />
       <el-table-column :label="$t('是否紧急')" width="140" align="center" prop="rushOrder" />
       <el-table-column :label="$t('工单类型')" align="center" prop="workorderType">
         <template slot-scope="scope">
@@ -659,6 +686,9 @@ export default {
         // sourceCode: null,
         productId: null,
         customerProjectNo: null,
+        customerDrawingNo: null,
+        orderCode: null,
+        orderSerial: null,
         productCode: null,
         productName: null,
         productSpc: null,

src/views/system/user/profile/worker.vue

@@ -94,6 +94,7 @@ export default {
       },
       // 表单参数
       form: {},
+      sForm: [],
       // 表单校验
       rules: {
         workstationId: [
@@ -179,12 +180,25 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    onworkunitSelected(row){
-      console.log(45456, row);
-      if (row != undefined && row != null) {
-        this.form.workunitId = row.workunitId;
-        this.form.workunitName = row.workunitName;
-        console.log(111111, this.form);
+    onworkunitSelected(rows){
+      // console.log(45456, rows);
+      if (rows != undefined && rows != null) {
+        rows.forEach((item) => {
+
+        });
+        this.sForm = rows.map(item => {
+          return {
+            ...this.form,
+            workunitId: item.workunitId,
+            workunitName: item.workunitName,
+          }
+        })
+        // this.form.workunitId = row.workunitId;
+        // this.form.workunitName = row.workunitName;
+        this.form.workunitId = (rows.map(item => item.workunitId)).join(",");
+        this.form.workunitName = (rows.map(item => item.workunitName)).join(",");
+        // console.log(111111, this.sForm);
+        // console.log(111111, this.form);
       }
     },
     /** 新增按钮操作 */
@@ -208,13 +222,13 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
-            updateWorkunituser(this.form).then(response => {
+            updateWorkunituser(this.sForm).then(response => {
               this.$modal.msgSuccess(this.$t('common.edit_success'));
               this.open = false;
               this.getList();
             });
           } else {
-            addWorkunituser(this.form).then(response => {
+            addWorkunituser(this.sForm).then(response => {
               this.$modal.msgSuccess(this.$t('common.add_success'));
               this.open = false;
               this.getList();

src/views/system/user/profile/workunitSelect.vue

@@ -33,7 +33,6 @@
         <el-form-item v-if="!workstationId" :label="$t('common.workstation')" prop="workstationName">
           <el-input
             v-model="queryParams.workstationName"
-           
             clearable
             @keyup.enter.native="handleQuery"
           />
@@ -56,9 +55,11 @@
         :data="workunitList"
         @current-change="handleCurrent"
         @row-dblclick="handleRowDbClick"
+        @selection-change="handleSelectionChange"
         height="500px"
       >
-        <el-table-column width="55" align="center">
+      <el-table-column type="selection" width="50" align="center" />
+        <!-- <el-table-column width="55" align="center">
           <template v-slot="scope">
             <el-radio
               v-model="selectedWorkunitId"
@@ -67,7 +68,7 @@
               >{{ "" }}</el-radio
             >
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column :label="$t('common.workstation_name')" width="180" prop="workstationName" />
         <el-table-column
           :label="$t('common.workunit_code')"
@@ -198,6 +199,13 @@
           this.selectedRows = row;
         }
       },
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.selectedRows = selection;
+        this.selectedWorkunitId = selection.map(item => item.workunitId);
+        this.single = selection.length != 1;
+        this.multiple = !selection.length;
+      },
       //双击选中
       handleRowDbClick(row) {
         if (row) {
@@ -222,4 +230,3 @@
     },
   };
   </script>
-  
\ No newline at end of file