ysy hace 2 años
padre
commit
4e20d78286

+ 2 - 1
src/enum/dict.js

@@ -36,7 +36,8 @@ export default {
   二级编码规则: 'Secondary',
   三级编码规则: 'Third',
   工艺参数单位: 'parameter_code',
-  成型剂类别: 'forming_code'
+  成型剂类别: 'forming_code',
+  工位编码: 'Station coding'
 
 
 };

+ 5 - 5
src/views/factoryModel/station/components/ProduceDialog.vue

@@ -102,11 +102,11 @@ export default {
   methods: {
     open(item) {
 
-      if(item) {
+      if (item) {
         this.current = {
-            id: item.taskIds,
-            name: item.taskNames,
-          }
+          id: item.taskIds,
+          name: item.taskNames,
+        }
       }
       this.radio = item.taskIds
       this.visible = true;
@@ -135,7 +135,7 @@ export default {
       if (!this.current) {
         return this.$message.warning('请选择工作中心')
       }
-      this.$emit('changeProduct',  this.current)
+      this.$emit('changeProduct', this.current)
       this.cancel()
 
     },

+ 126 - 0
src/views/factoryModel/station/components/codeDialog.vue

@@ -0,0 +1,126 @@
+<template>
+    <ele-modal title="自定义编码" :visible.sync="visible" :before-close="handleClose" :close-on-click-modal="false"
+        :close-on-press-escape="false" append-to-body width="40%">
+        <el-form label-width="120px" ref="formRef" :model="formData" :rules="rules" class="rx-sc">
+
+
+
+            <el-form-item label="">
+                <el-input v-model="formData.leave" readonly style="width: 120px;margin-left: 8px;"></el-input>
+            </el-form-item>
+
+
+            <span>-</span>
+            <el-form-item label="" prop="leave2">
+                <DictSelection :ChinEng="true" dictName="工位编码" clearable v-model="formData.leave2">
+                </DictSelection>
+            </el-form-item>
+
+            <span>-</span>
+
+            <el-form-item label="" prop="code">
+                <el-input v-model="formData.code" maxlength="3" placeholder="流水号"
+                    style="width: 120px;margin-left: 8px;"></el-input>
+            </el-form-item>
+
+
+
+
+
+
+
+        </el-form>
+        <div class="des">工位编码规则,例如:GW-PL(本级)-0001 </div>
+
+        <template v-slot:footer>
+            <el-button @click="handleClose">取消</el-button>
+            <el-button type="primary" @click="save" :loading="loading">
+                保存
+            </el-button>
+        </template>
+
+    </ele-modal>
+</template>
+  
+<script>
+
+export default {
+    data() {
+        return {
+            visible: true,
+            loading: false,
+
+            formData: {
+                leave: 'GW',
+                leave2: null,
+
+                code: null
+            },
+
+            rules: {
+                leave2: { required: true, message: '请选择', trigger: 'change' },
+   
+                code: [
+                    { required: true, message: '请输入流水号', trigger: 'blur' },
+                    {
+                        pattern: /^\d{3}$/,
+                        message: '请输入三位数的流水号'
+                    }
+                ]
+            }
+        }
+    },
+
+    watch: {
+
+    },
+    methods: {
+
+        handleClose() {
+            this.$emit('close')
+
+        },
+
+        save() {
+            this.$refs.formRef.validate((valid) => {
+                if (!valid) {
+                    return false;
+                }
+                let code = this.formData.leave + '-' + this.formData.leave2 + '-'  + this.formData.code
+                this.$emit('chooseCode', code)
+                this.handleClose()
+
+
+            })
+        },
+
+
+    }
+}
+</script>
+  
+<style lang="scss" scoped>
+.row_flex {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+::v-deep .el-form-item__content {
+    margin: 0 8px !important;
+}
+
+::v-deep .el-form-item {
+    margin-bottom: 0px;
+}
+
+::v-deep .el-form-item:last-child {
+    margin-bottom: 0px !important;
+
+}
+
+.des {
+    margin-top: 20px;
+}
+</style>
+  

+ 24 - 3
src/views/factoryModel/station/components/edit.vue

@@ -7,7 +7,7 @@
         <el-row>
           <el-col :span="8">
             <el-form-item label="工位编码:" prop="code">
-              <el-input clearable :maxlength="20" v-model="form.code" placeholder="请输入" />
+              <el-input clearable  @click.native="openCode"  v-model="form.code" placeholder="请输入" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -131,6 +131,10 @@
     <!-- 选择设备 -->
     <ProductModal ref="productRefs" @changeProduct='determineChoose' />
     <ProduceDialog ref="produceRef" @changeProduct="produceConfirm" />
+
+        <!--  自定义编码 -->
+        <CodeDialog ref="codeRefs" v-if="codeShow" @close="codeShow= false"  @chooseCode="chooseCode"></CodeDialog>
+
   </el-dialog>
 </template>
 
@@ -146,10 +150,12 @@ import ProductModal from '@/views/technology/productParam/components/ProductModa
 import producetask from '@/api/technology/production';
 import work from '@/api/technology/work';
 import ProduceDialog from './ProduceDialog'
+import CodeDialog from './codeDialog.vue'
 export default {
   components: {
     ProductModal,
-    ProduceDialog
+    ProduceDialog,
+    CodeDialog
   },
   props: {
     options_groupId: {
@@ -194,7 +200,10 @@ export default {
         remark: '',
         taskIds: null,
         taskNames: null,
-        workstationSubstanceList: []
+        workstationSubstanceList: [],
+
+
+     
       };
     };
     return {
@@ -250,6 +259,7 @@ export default {
       visible: false,
       type: '', // add/edit
       loading: false,
+      codeShow: false,
       options: {
         leaderId: [],
         workshopId: [],
@@ -322,6 +332,17 @@ export default {
 
     },
 
+    openCode() {
+    this.codeShow =true
+    },
+
+    chooseCode(code) {
+      this.$set(this.form, 'code', code);
+      this.codeShow = false
+      this.$forceUpdate()
+    },
+
+
     open(type, row) {
       this.type = type;
       this.visible = true;

+ 2 - 2
src/views/material/product/components/codeDialog.vue

@@ -35,7 +35,7 @@
 
 
         </el-form>
-        <div class="des">设备\模具\周转车\舟皿三级编码规则,例如:CX-JY-SB(本级)-0001 </div>
+        <div class="des">设备\模具\周转车\舟皿三级编码规则,例如:CX-JY-SB(本级)-001 </div>
 
         <template v-slot:footer>
             <el-button @click="handleClose">取消</el-button>
@@ -69,7 +69,7 @@ export default {
                     { required: true, message: '请输入流水号', trigger: 'blur' },
                     {
                         pattern: /^\d{3}$/,
-                        message: '请输入位数的流水号'
+                        message: '请输入位数的流水号'
                     }
                 ]
             }