SJ 4 днів тому
батько
коміт
9d402326d8

+ 3 - 3
src/views/lg/DefectiveProduct/DefectiveProductList.vue

@@ -177,9 +177,9 @@
             dataIndex: 'dueDate'
           },
           {
-            title:'Comment1',
+            title:'Dept',
             align:"center",
-            dataIndex: 'comment1'
+            dataIndex: 'dept'
           },
           {
             title:'Remark',
@@ -227,7 +227,7 @@
         fieldList.push({type:'string',value:'tool',text:'tool',dictCode:''})
         fieldList.push({type:'string',value:'po',text:'po',dictCode:''})
         fieldList.push({type:'string',value:'dueDate',text:'due_date',dictCode:''})
-        fieldList.push({type:'string',value:'comment1',text:'comment1',dictCode:''})
+        fieldList.push({type:'string',value:'dept',text:'dept',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'remark',dictCode:''})
         this.superFieldList = fieldList
       }

+ 2 - 2
src/views/lg/DefectiveProduct/modules/DefectiveProductForm.vue

@@ -39,8 +39,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="Comment1" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="comment1">
-              <a-input v-model="model.comment1" placeholder="请输入cComment1"  ></a-input>
+            <a-form-model-item label="Dept" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dept">
+              <a-input v-model="model.dept" placeholder="请输入Dept"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

+ 6 - 6
src/views/lg/ReasonRule/ReasonRuleList.vue

@@ -142,14 +142,14 @@
             }
           },
           {
-            title:'Comment1',
+            title:'Dept',
             align:"center",
-            dataIndex: 'comment1'
+            dataIndex: 'dept'
           },
           {
-            title:'Comment2',
+            title:'Reason',
             align:"center",
-            dataIndex: 'comment2'
+            dataIndex: 'reason'
           },
           {
             title:'Remark',
@@ -190,8 +190,8 @@
       },
       getSuperFieldList(){
         let fieldList=[];
-        fieldList.push({type:'string',value:'comment1',text:'comment1',dictCode:''})
-        fieldList.push({type:'string',value:'comment2',text:'comment2',dictCode:''})
+        fieldList.push({type:'string',value:'dept',text:'dept',dictCode:''})
+        fieldList.push({type:'string',value:'reason',text:'reason',dictCode:''})
         fieldList.push({type:'string',value:'remark',text:'remark',dictCode:''})
         this.superFieldList = fieldList
       }

+ 113 - 113
src/views/lg/ReasonRule/modules/ReasonRuleForm.vue

@@ -1,114 +1,114 @@
-<template>
-  <a-spin :spinning="confirmLoading">
-    <j-form-container :disabled="formDisabled">
-      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
-        <a-row>
-          <a-col :span="24">
-            <a-form-model-item label="Comment1" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="comment1">
-              <a-input v-model="model.comment1" placeholder="请输入comment1"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="Comment2" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="comment2">
-              <a-input v-model="model.comment2" placeholder="请输入comment2"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="Remark" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
-              <a-input v-model="model.remark" placeholder="请输入remark"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-      </a-form-model>
-    </j-form-container>
-  </a-spin>
-</template>
-
-<script>
-
-  import { httpAction, getAction } from '@/api/manage'
-  import { validateDuplicateValue } from '@/utils/util'
-
-  export default {
-    name: 'ReasonRuleForm',
-    components: {
-    },
-    props: {
-      //表单禁用
-      disabled: {
-        type: Boolean,
-        default: false,
-        required: false
-      }
-    },
-    data () {
-      return {
-        model:{
-         },
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        confirmLoading: false,
-        validatorRules: {
-        },
-        url: {
-          add: "/reasonRule/add",
-          edit: "/reasonRule/edit",
-          queryById: "/reasonRule/queryById"
-        }
-      }
-    },
-    computed: {
-      formDisabled(){
-        return this.disabled
-      },
-    },
-    created () {
-       //备份model原始值
-      this.modelDefault = JSON.parse(JSON.stringify(this.model));
-    },
-    methods: {
-      add () {
-        this.edit(this.modelDefault);
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      submitForm () {
-        const that = this;
-        // 触发表单验证
-        this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-            })
-          }
-
-        })
-      },
-    }
-  }
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="Dept" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dept">
+              <a-input v-model="model.dept" placeholder="请输入Dept"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="Reason" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reason">
+              <a-input v-model="model.reason" placeholder="请输入Reason"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="Remark" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
+              <a-input v-model="model.remark" placeholder="请输入remark"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'ReasonRuleForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/reasonRule/add",
+          edit: "/reasonRule/edit",
+          queryById: "/reasonRule/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+
+        })
+      },
+    }
+  }
 </script>