update:修改排产换型对照信息

src/components/itemType/single.vue

@@ -7,7 +7,7 @@
     width="80%"
     append-to-body
   >
-    <el-row :gutter="20">
+    <el-row :gutter="20" style="max-height: 600px; overflow-y: auto;">
       <!--分类数据-->
       <el-col :span="4" :xs="24">
         <div class="head-container">
@@ -41,7 +41,7 @@
           :inline="true"
           v-show="showSearch"
           label-width="68px"
-        >   
+        >
          <!-- <el-form-item label="排序" prop="orderNum">
             <el-input
               v-model="queryParams.orderNum"
@@ -89,7 +89,7 @@
               >
             </template>
           </el-table-column>
-      <el-table-column 
+      <el-table-column
             label="分类"
             align="left"
             key="itemTypeName"
@@ -98,7 +98,7 @@
             :show-overflow-tooltip="true"
       >
       </el-table-column>
-      <el-table-column 
+      <el-table-column
                 label="排序"
             align="center"
             key="orderNum"
@@ -122,7 +122,7 @@
               />
             </template>
           </el-table-column>
-     
+
         </el-table>
 
         <pagination
@@ -206,7 +206,7 @@ export default {
      listItemType(this.queryParams).then(response => {
         this.itemList = response.data;
         // this.total = response.total;
-        
+
         this.loading = false;
       });
     },
@@ -234,8 +234,8 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
        this.form = {
-        itemTypeName: null,        
-        orderNum: null,        
+        itemTypeName: null,
+        orderNum: null,
         itemOrProduct: null
         };
       this.resetForm("queryForm");

src/components/process/taskSelectSingle.vue

@@ -4,7 +4,6 @@
     :visible.sync="showFlag"
     :modal= false
     width="80%"
-    center
     >
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
           <el-form-item label="所属工序" prop="processName">
@@ -38,7 +37,7 @@
           </template>
         </el-table-column>
      <el-table-column label="工序编码" align="center" prop="processCode"/>
-     
+
       <el-table-column label="工序名称" align="center" prop="processName" />
       <el-table-column label="是否启用" align="center" prop="enableFlag">
         <template slot-scope="scope">
@@ -114,7 +113,7 @@
         },
         // 表单参数
         form: {},
-        
+
       };
     },
     created() {
@@ -146,8 +145,8 @@
       /** 重置按钮操作 */
       resetQuery() {
        this.form = {
-        processName: null,        
-        processCode: null,        
+        processName: null,
+        processCode: null,
         };
         this.resetForm("queryForm");
         this.handleQuery();

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

@@ -5,7 +5,7 @@
         <el-input
           v-model="queryParams.arrangeRuleCode"
           placeholder="请输入编排对照编码"
-   
+
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -183,7 +183,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -198,8 +198,8 @@
         <el-row>
           <el-col span="12">
         <el-form-item label="编排对照编码" prop="arrangeRuleCode">
-          <el-input 
-          v-model="form.arrangeRuleCode" 
+          <el-input
+          v-model="form.arrangeRuleCode"
           placeholder="自动生成"
           disabled
           />
@@ -257,7 +257,7 @@
         </el-col>
         </el-row>
         <el-row>
-           <el-col span="12">        
+           <el-col span="12">
             <el-form-item label="工艺要求" label-width="120px">
               <el-radio-group v-model="form.routeDesc" disabled v-if="optType=='view'">
                 <el-radio
@@ -522,7 +522,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-       
+
         <el-form-item label="印刷尺寸" label-width="120px">
               <el-radio-group v-model="form.printingWidth" disabled v-if="optType=='view'">
                 <el-radio
@@ -550,11 +550,11 @@
 
 <script>
 
-import { 
-listProWorkOrderArrangeRule, 
-getProWorkOrderArrangeRule, 
-delProWorkOrderArrangeRule, 
-addProWorkOrderArrangeRule, 
+import {
+listProWorkOrderArrangeRule,
+getProWorkOrderArrangeRule,
+delProWorkOrderArrangeRule,
+addProWorkOrderArrangeRule,
 updateProWorkOrderArrangeRule } from "@/api/mes/pro/arrangeRule";
 import { genCode } from "@/api/system/autocode/rule";
 import BrandSelect from "@/components/itemType/single.vue";
@@ -587,27 +587,27 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        arrangeRuleCode: null,        
-        itemTypeId: null,        
-        itemTypeName: null,        
-        processId: null,        
-        processName: null,        
-        routeCode: null,        
-        routeDesc: null,        
-        brandCode: null,        
-        itemCode: null,        
-        length: null,        
-        width: null,        
-        productMaterial: null,        
-        processCode: null,        
-        spacing: null,        
-        frontImg: null,        
-        toolList: null,        
-        shape: null,        
-        inlay: null,        
-        blownFilmWidth: null,        
-        blownFilmThickness: null,        
-        printingWidth: null      
+        arrangeRuleCode: null,
+        itemTypeId: null,
+        itemTypeName: null,
+        processId: null,
+        processName: null,
+        routeCode: null,
+        routeDesc: null,
+        brandCode: null,
+        itemCode: null,
+        length: null,
+        width: null,
+        productMaterial: null,
+        processCode: null,
+        spacing: null,
+        frontImg: null,
+        toolList: null,
+        shape: null,
+        inlay: null,
+        blownFilmWidth: null,
+        blownFilmThickness: null,
+        printingWidth: null
         },
       // 表单参数
       form: {},
@@ -649,28 +649,28 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        arrangeRuleId: null,        
-        arrangeRuleCode: null,        
-        itemTypeId: null,        
-        itemTypeName: null,        
-        processId: null,        
-        processName: null,        
-        routeCode: null,        
-        routeDesc: null,        
-        brandCode: null,        
-        itemCode: null,        
-        length: null,        
-        width: null,        
-        productMaterial: null,        
-        processCode: null,        
-        spacing: null,        
-        frontImg: null,        
-        toolList: null,       
-        shape: null,        
-        inlay: null,        
-        blownFilmWidth: null,        
-        blownFilmThickness: null,        
-        printingWidth: null      
+        arrangeRuleId: null,
+        arrangeRuleCode: null,
+        itemTypeId: null,
+        itemTypeName: null,
+        processId: null,
+        processName: null,
+        routeCode: null,
+        routeDesc: null,
+        brandCode: null,
+        itemCode: null,
+        length: null,
+        width: null,
+        productMaterial: null,
+        processCode: null,
+        spacing: null,
+        frontImg: null,
+        toolList: null,
+        shape: null,
+        inlay: null,
+        blownFilmWidth: null,
+        blownFilmThickness: null,
+        printingWidth: null
         };
       this.resetForm("form");
     },
@@ -684,7 +684,7 @@ export default {
       this.resetForm("queryForm");
       this.handleQuery();
     },
-         handleBrandSelect(){
+    handleBrandSelect(){
       this.$refs.brSelect.showFlag = true;
     },
     onBrandSelected(row){
@@ -702,7 +702,7 @@ export default {
      if (row != undefined && row != null) {
          this.form.processId = row.processId;
         this.form.processName = row.processName;
-      
+
       }
     },
 

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

 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="换型关键字" prop="ruleCode">
-        <el-input
-          v-model="queryParams.ruleCode"
-          placeholder="请输入换型关键字"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="产品类别ID" prop="itemTypeId">
-        <el-input
-          v-model="queryParams.itemTypeId"
-          placeholder="请输入产品类别ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="产品类别名称" prop="itemTypeName">
         <el-input
           v-model="queryParams.itemTypeName"
@@ -25,14 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工序ID" prop="processId">
-        <el-input
-          v-model="queryParams.processId"
-          placeholder="请输入工序ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="工序名称" prop="processName">
         <el-input
           v-model="queryParams.processName"
@@ -41,94 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="刀" prop="tool">
-        <el-input
-          v-model="queryParams.tool"
-          placeholder="请输入刀"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="模" prop="mould">
-        <el-input
-          v-model="queryParams.mould"
-          placeholder="请输入模"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="版" prop="plate">
-        <el-input
-          v-model="queryParams.plate"
-          placeholder="请输入版"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="材料" prop="materialRecoil">
-        <el-input
-          v-model="queryParams.materialRecoil"
-          placeholder="请输入材料"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="印张长度" prop="sheetLength">
-        <el-input
-          v-model="queryParams.sheetLength"
-          placeholder="请输入印张长度"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="印张宽度" prop="sheetWidth">
-        <el-input
-          v-model="queryParams.sheetWidth"
-          placeholder="请输入印张宽度"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="产品规格" prop="productStandard">
-        <el-input
-          v-model="queryParams.productStandard"
-          placeholder="请输入产品规格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="正反颜色" prop="proConColor">
-        <el-input
-          v-model="queryParams.proConColor"
-          placeholder="请输入正反颜色"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="inlay">
-        <el-input
-          v-model="queryParams.inlay"
-          placeholder="请输入"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="工艺路线" prop="routeCode">
-        <el-input
-          v-model="queryParams.routeCode"
-          placeholder="请输入工艺路线"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="产品材质宽度" prop="productWidth">
-        <el-input
-          v-model="queryParams.productWidth"
-          placeholder="请输入产品材质宽度"
-          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>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -183,24 +71,22 @@
 
     <el-table v-loading="loading" :data="scheduleSetupRuleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="产品材质宽度" align="center" prop="ruleId" />
-      <el-table-column label="换型关键字" align="center" prop="ruleCode" />
-      <el-table-column label="产品类别ID" align="center" prop="itemTypeId" />
-      <el-table-column label="产品类别名称" align="center" prop="itemTypeName" />
-      <el-table-column label="工序ID" align="center" prop="processId" />
-      <el-table-column label="工序名称" align="center" prop="processName" />
-      <el-table-column label="刀" align="center" prop="tool" />
-      <el-table-column label="模" align="center" prop="mould" />
-      <el-table-column label="版" align="center" prop="plate" />
-      <el-table-column label="材料" align="center" prop="materialRecoil" />
+      <el-table-column label="产品材质宽度" align="center" width="120" prop="ruleId" />
+      <el-table-column label="换型关键字" align="center" width="120" prop="ruleCode" />
+      <el-table-column label="产品类别名称" align="center" width="120" prop="itemTypeName" />
+      <el-table-column label="工序名称" align="center" width="120" prop="processName" />
+      <el-table-column label="刀" align="center" width="55" prop="tool" />
+      <el-table-column label="模" align="center" width="55" prop="mould" />
+      <el-table-column label="版" align="center" width="55" prop="plate" />
+      <el-table-column label="材料" align="center" width="80" prop="materialRecoil" />
       <el-table-column label="印张长度" align="center" prop="sheetLength" />
       <el-table-column label="印张宽度" align="center" prop="sheetWidth" />
       <el-table-column label="产品规格" align="center" prop="productStandard" />
       <el-table-column label="正反颜色" align="center" prop="proConColor" />
-      <el-table-column label="" align="center" prop="inlay" />
+      <el-table-column label="Inlay" align="center" prop="inlay" />
       <el-table-column label="工艺路线" align="center" prop="routeCode" />
-      <el-table-column label="产品材质宽度" align="center" prop="productWidth" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="产品材质宽度" width="120" align="center" prop="productWidth" />
+      <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -229,56 +115,112 @@
     />
 
     <!-- 添加或修改排产换型对照信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="换型关键字" prop="ruleCode">
-          <el-input v-model="form.ruleCode" placeholder="请输入换型关键字" />
-        </el-form-item>
-        <el-form-item label="产品类别ID" prop="itemTypeId">
-          <el-input v-model="form.itemTypeId" placeholder="请输入产品类别ID" />
-        </el-form-item>
-        <el-form-item label="产品类别名称" prop="itemTypeName">
-          <el-input v-model="form.itemTypeName" placeholder="请输入产品类别名称" />
-        </el-form-item>
-        <el-form-item label="工序ID" prop="processId">
-          <el-input v-model="form.processId" placeholder="请输入工序ID" />
-        </el-form-item>
-        <el-form-item label="工序名称" prop="processName">
-          <el-input v-model="form.processName" placeholder="请输入工序名称" />
-        </el-form-item>
-        <el-form-item label="刀" prop="tool">
-          <el-input v-model="form.tool" placeholder="请输入刀" />
-        </el-form-item>
-        <el-form-item label="模" prop="mould">
-          <el-input v-model="form.mould" placeholder="请输入模" />
-        </el-form-item>
-        <el-form-item label="版" prop="plate">
-          <el-input v-model="form.plate" placeholder="请输入版" />
-        </el-form-item>
-        <el-form-item label="材料" prop="materialRecoil">
-          <el-input v-model="form.materialRecoil" placeholder="请输入材料" />
-        </el-form-item>
-        <el-form-item label="印张长度" prop="sheetLength">
-          <el-input v-model="form.sheetLength" placeholder="请输入印张长度" />
-        </el-form-item>
-        <el-form-item label="印张宽度" prop="sheetWidth">
-          <el-input v-model="form.sheetWidth" placeholder="请输入印张宽度" />
-        </el-form-item>
-        <el-form-item label="产品规格" prop="productStandard">
-          <el-input v-model="form.productStandard" placeholder="请输入产品规格" />
-        </el-form-item>
-        <el-form-item label="正反颜色" prop="proConColor">
-          <el-input v-model="form.proConColor" placeholder="请输入正反颜色" />
-        </el-form-item>
-        <el-form-item label="" prop="inlay">
-          <el-input v-model="form.inlay" placeholder="请输入" />
-        </el-form-item>
-        <el-form-item label="工艺路线" prop="routeCode">
-          <el-input v-model="form.routeCode" placeholder="请输入工艺路线" />
-        </el-form-item>
-        <el-form-item label="产品材质宽度" prop="productWidth">
-          <el-input v-model="form.productWidth" placeholder="请输入产品材质宽度" />
-        </el-form-item>
+    <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="换型关键字" prop="ruleCode">
+              <el-input v-model="form.ruleCode" placeholder="请输入换型关键字" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="产品类别ID" prop="itemTypeId">
+              <el-input disabled v-model="form.itemTypeId" placeholder="请输入产品类别ID" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="产品类别名称" prop="itemTypeName">
+              <el-input v-model="form.itemTypeName" placeholder="请输入产品类别名称" >
+              <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="handleBrandSelect"
+                ></el-button>
+              </el-input>
+              <BrandSelect
+                ref="brSelect"
+                v-if="open"
+                @onSelected="onBrandSelected"
+              ></BrandSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工序ID" prop="processId">
+              <el-input disabled v-model="form.processId" placeholder="请输入工序ID" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工序名称" prop="processName">
+              <el-input v-model="form.processName" placeholder="请输入工序名称" >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="handleProcess"
+                ></el-button>
+              </el-input>
+              <ProcessSelect
+                ref="brSelectpro"
+                v-if="open"
+                @onSelected="onBrandProcess"
+              ></ProcessSelect>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="刀" prop="tool">
+              <el-input-number v-model="form.tool" :min="0" :step="1" step-strictly></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="模" prop="mould">
+              <el-input-number v-model="form.mould" :min="0" :step="1" step-strictly></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="版" prop="plate">
+              <el-input-number v-model="form.plate" :min="0" :step="1" step-strictly></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="材料" prop="materialRecoil">
+              <el-input-number v-model="form.materialRecoil" :min="0" :step="1" step-strictly></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="印张长度" prop="sheetLength">
+              <el-input-number v-model="form.sheetLength" :min="0" :step="1" step-strictly></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="印张宽度" prop="sheetWidth">
+              <el-input-number v-model="form.sheetWidth" :min="0" :step="1" step-strictly></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="产品规格" prop="productStandard">
+              <el-input-number v-model="form.productStandard" :min="0" :step="1" step-strictly></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="正反颜色" prop="proConColor">
+              <el-input-number v-model="form.proConColor" :min="0" :step="1" step-strictly></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="Inlay" prop="inlay">
+              <el-input-number v-model="form.inlay" :min="0" :step="1" step-strictly></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="工艺路线" prop="routeCode">
+              <el-input-number v-model="form.routeCode" :min="0" :step="1" step-strictly></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="产品材质宽度" prop="productWidth">
+              <el-input-number v-model="form.productWidth" :min="0" :step="1" step-strictly></el-input-number>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -290,9 +232,13 @@
 
 <script>
 import { listScheduleSetupRule, getScheduleSetupRule, delScheduleSetupRule, addScheduleSetupRule, updateScheduleSetupRule } from "@/api/mes/pro/scheduleSetupRule";
+import BrandSelect from "@/components/itemType/single.vue";
+import ProcessSelect from "@/components/process/taskSelectSingle.vue";
+
 
 export default {
   name: "ScheduleSetupRule",
+  components: {BrandSelect,ProcessSelect},
   data() {
     return {
       // 遮罩层
@@ -354,6 +300,25 @@ export default {
       this.queryParams.pageNum = 1;
       this.getList();
     },
+    handleBrandSelect(){
+      this.$refs.brSelect.showFlag = true;
+    },
+    onBrandSelected(row){
+     if (Object.values(row).length > 0) {
+        this.form.itemTypeId = row.itemTypeId;
+        this.form.itemTypeName = row.itemTypeName;
+      }
+    },
+    handleProcess(){
+      this.$refs.brSelectpro.showFlag = true;
+    },
+    onBrandProcess(row){
+     if (Object.values(row).length > 0) {
+         this.form.processId = row.processId;
+        this.form.processName = row.processName;
+
+      }
+    },
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");