Merge branch 'master' of http://139.196.39.194:9021/yuansh/doors-windows-web

src/views/production/Popup/ClassNamePopup.vue

@@ -133,6 +133,8 @@
               return {
                 on: {
                   click: () => {
+                    this.selectedRowKeys=[]
+                    this.selectedRows=[]
                     this.selectedRowKeys.push(index)
                     this.selectedRows.push(record)
                   },

src/views/production/Popup/OperatorsPopup.vue

@@ -133,6 +133,9 @@
               return {
                 on: {
                   click: () => {
+                   
+                    this.selectedRowKeys=[]
+                    this.selectedRows=[]
                     this.selectedRowKeys.push(index)
                     this.selectedRows.push(record)
                   },

src/views/production/Popup/deparmentPopup.vue

@@ -133,6 +133,8 @@
               return {
                 on: {
                   click: () => {
+                    this.selectedRowKeys=[]
+                    this.selectedRows=[]
                     this.selectedRowKeys.push(index)
                     this.selectedRows.push(record)
                   },

src/views/production/Popup/inventoryPopup.vue

@@ -157,6 +157,8 @@
               return {
                 on: {
                   click: () => {
+                    this.selectedRowKeys=[]
+                    this.selectedRows=[]
                     this.selectedRowKeys.push(index)
                     this.selectedRows.push(record)
                   },

src/views/production/Popup/inventoryTypePopup.vue

@@ -112,6 +112,8 @@
               return {
                 on: {
                   click: () => {
+                    this.selectedRowKeys=[]
+                    this.selectedRows=[]
                     this.selectedRowKeys.push(index)
                     this.selectedRows.push(record)
                   },

src/views/production/Popup/organizationPopup.vue

@@ -132,6 +132,8 @@
               return {
                 on: {
                   click: () => {
+                    this.selectedRowKeys=[]
+                    this.selectedRows=[]
                     this.selectedRowKeys.push(index)
                     this.selectedRows.push(record)
                   },

src/views/production/Popup/projectPopup.vue

@@ -139,6 +139,8 @@
               return {
                 on: {
                   click: () => {
+                    this.selectedRowKeys=[]
+                    this.selectedRows=[]
                     this.selectedRowKeys.push(index)
                     this.selectedRows.push(record)
                   },

src/views/production/safetyStock/modules/AddEncoder.vue

@@ -19,7 +19,7 @@
                 </a-col>
                 <a-col :md="8" :sm="24">
                   <a-form-model-item label="料品类别"  prop='classifyName' >
-                    <a-input-search placeholder="请输入" v-model="form.classifyName" @search="searchClassName"></a-input-search>
+                    <a-input-search placeholder="请输入" readonly v-model="form.classifyName" @search="searchClassName"></a-input-search>
                   </a-form-model-item>
                 </a-col>
                 <a-col :md="8" :sm="24" >
@@ -88,6 +88,9 @@
               inventoryName: [
                 { required: true, trigger: 'blur' },
               ],
+              classifyName: [
+                { required: true, trigger: 'blur' },
+              ],
               color:[
                 { required: true, trigger: 'blur' },
               ],
@@ -171,6 +174,7 @@
             okData(data){
               this.$set(this.form,'classifyName',data.name)
               this.$set(this.form,'classify',data.id )
+              this.$set(this.form,'classifyCode',data.code )
               this.$refs.form.clearValidate()
             },
             searchClassName(){