Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

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

@@ -679,7 +679,6 @@ export default {
         layerNum: "",
         width: "",
         height: "",
-        moduleNum: "",
         printingPaperlenth: "",
         printPaperwidth: "",
         sendworkMultiple: "",
@@ -715,6 +714,8 @@ export default {
         isNeedShoeImg: "",
         dieSunkOffsetOilTankNum: "",
         printingMethod: "",
+        moduleNum: "",
+
       },
       currentRow: {},
       currentRowIndex: undefined,
@@ -750,7 +751,6 @@ export default {
         specificationSheetType: "",
         brandName: "",
         enName: "",
-        moduleNum: "",
         unitOfMeasure: "",
         conversionValue: "",
         singleLayerThick: "",
@@ -794,6 +794,7 @@ export default {
         isNeedShoeImg: "",
         dieSunkOffsetOilTankNum: "",
         printingMethod: "",
+         moduleNum: "",
       };
     },
     /**重置组件状态 */

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

@@ -236,6 +236,19 @@
               <el-input v-model="form.endSerial" :disabled="mode == 'make'" placeholder="请输入结束序列码" />
             </el-form-item>
           </el-col>
+          <el-col :lg="6" :md="8" :sm="12" :xs="12">
+            <el-form-item label="是否急单" prop="rushOrder">
+              <el-select v-model="form.rushOrder" :disabled="mode == 'make'"   >
+              <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                  disabled
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :lg="18" :md="16" :sm="24" :xs="24">
             <el-form-item label="工单备注" prop="remark">
               <el-input

src/views/mes/pro/workstationRequest/components/requestIndex.vue

@@ -12,9 +12,6 @@
                     <el-button size="mini" type="text" icon="el-icon-delete" @click="deleteRow($index)">删除</el-button>
                     <el-button size="mini" type="text" icon="el-icon-update" @click="updateRow($index)">修改</el-button>
                 </template>
-                
-                    
-               
             </el-table-column>
         </el-table>
 
@@ -37,34 +34,7 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <!-- <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="工作中心编码" prop="workstationCode">
-                            <el-input v-model="form.workstationCode" placeholder="请输入工作中心编码">
-                                <el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect" />
-                            </el-input>
-
-                        </el-form-item>
-                        <WorkstationSelect ref="brSelectworkstation"
-                            @onSelected="val => onWorkstationSelect(val, 'workstation')"
-                            :workstationCode="form.workstationCode">
-                        </WorkstationSelect>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="工作单元" prop="workunitCode">
-                            <el-input v-model="form.workunitCode" placeholder="工作单元">
-                                <el-button slot="append" icon="el-icon-search"
-                                    @click="$refs.codeSelect.showFlag = true"></el-button>
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <WorkstationSelect ref="brSelectworkstation"
-                    @onSelected="val => onWorkstationSelect(val, 'workstation')"
-                    :workstationCode="form.workstationCode">
-                </WorkstationSelect>
-                <codeSelect ref="codeSelect" :workstationId="form.workstationId"
-                    @onSelected="val => onWorkstationSelect(val, 'unit')"></codeSelect> -->
+                
                 <el-row>
                     <el-col :span="12">
           <el-form-item label="申请数量" prop="applyNum">
@@ -79,23 +49,18 @@
             </div>
         </el-dialog>
 
-
-
-        <!-- 
-        <pagination v-show="total > 0 && $attrs.optType !== 'add'" :total="total" :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize" @pagination="getList" /> -->
     </div>
 </template>
 
 <script>
-import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue";
+import codeSelect from "./codeSelect.vue";
 import ItemSelect from "@/components/itemSelect/single.vue";
 export default {
     name: "TmToolRequestItem",
     dicts: [
         "warehouse_desc"
     ],
-    components: { ItemSelect, WorkstationSelect },
+    components: { ItemSelect, codeSelect },
     props: {
         id: {
             type: String,
@@ -135,11 +100,6 @@ export default {
                 sapItemCode: null,
                 itemName: null,
                 applyNum: null,
-                workstationCode: null,
-                workunitCode: null,
-                workstationCode: null,
-                workstationId: null,
-                workstationName: null,
             },
             // 表单参数
             form: { 
@@ -147,11 +107,6 @@ export default {
                 sapItemCode: null,
                 itemName: null,
                 applyNum: null,
-                workstationCode: null,
-                workunitCode: null,
-                workstationCode: null,
-                workstationId: null,
-                workstationName: null,
             },
 
             currentRowIdx: undefined,
@@ -160,12 +115,6 @@ export default {
                 sapItemCode: [
                     { required: true, message: "产品编码不能为空", trigger: "blur" }
                 ],
-                workstationCode: [
-                    { required: true, message: "工作中心编码不能为空", trigger: "blur" }
-                ],
-                workunitCode: [
-                    { required: true, message: "工作单元编码不能为空", trigger: "blur" }
-                ],
                 applyNum: [
                     { required: true, message: "申请数量不能为空", trigger: "blur" }
                 ],
@@ -225,45 +174,30 @@ export default {
 
         /**表单提交 */
         submitForm() {
+            if(this.form.sapItemCode==null){
+                this.open = true;
+                this.$modal.confirm('物料编码不能为空');
+                return;
+            }
            
             if(this.form.applyNum==0){
                 this.open = true;
                 this.$modal.confirm('申请数量需要输入数字');
                 return;
             }
+          
             this.$refs["form"].validate((valid) => {
                 if (valid) {
                     if (this.optType == "add") {
                         this.tableData.unshift(JSON.parse(JSON.stringify(this.form)));
                     }else if(this.optType == "edit"){
-                        this.$set(this.tableData, this.indexs, JSON.parse(JSON.stringify(this.form)))
+                        this.tableData[this.indexs]=JSON.parse(JSON.stringify(this.form));
                     }
                     this.showFlag = false;
                 }
             });
             this.open = false;
         },
-
-        handleWorkstationSelect() {
-            this.$refs.brSelectworkstation.showFlag = true;
-        },
-        onWorkstationSelect(row, type) {
-            console.log('row', type, row)
-            if (row != undefined && row != null) {
-                if (type === 'unit') {
-                    // this.form.workunitName = row.workunitName
-                    this.$set(this.form, 'workunitCode', row.workunitCode)
-                    this.form.workstationId = row.workstationId;
-                    this.form.workstationCode = row.workstationCode;
-                    this.form.workstationName = row.workstationName;
-                } else {
-                    this.form.workstationId = row.workstationId;
-                    this.form.workstationCode = row.workstationCode;
-                    this.form.workstationName = row.workstationName;
-                }
-            }
-
-        },
         /**删除行 */
         deleteRow(index) {
             this.tableData.splice(index, 1);
@@ -272,7 +206,7 @@ export default {
         updateRow(index){
             console.log(index);
             this.indexs=index;
-            this.form = JSON.parse(JSON.stringify(this.tableData[index]));
+            this.form = this.tableData[index];
             this.open = true;
             this.optType = "edit";
         },

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

@@ -359,14 +359,11 @@ export default {
             form: {},
             // 表单校验
             rules: {
-                taskCode: [
-                    { required: true, message: "任务单号称不能为空", trigger: "blur" }
-                ],
-                arrangeCode: [
-                    { required: true, message: "编排单号称不能为空", trigger: "blur" }
+                workstationCode: [
+                    { required: true, message: "工作中心不能为空", trigger: "blur" }
                 ],
                 createTime: [
-                    { required: true, message: "编排单号称不能为空", trigger: "blur" }
+                    { required: true, message: "申请时间不能为空", trigger: "blur" }
                 ],
             }
         };