Merge branch 'master' of http://112.74.164.79:3000/chenying/X-web

src/views/modules/production/plan-submit.vue

@@ -30,7 +30,7 @@
         </el-col>
       </el-row>
 
-      <el-table 
+      <el-table
         :data="dataForm.proProductList"
         border
         v-loading="dataListLoading"
@@ -227,12 +227,12 @@ export default {
       disabled: false,
       id: 0,
       dataForm: {
-        proProductList:[]
+        proProductList: []
       },
       dataRule: {
-        planCnt:[{required:true, message:'请输入', trigger:'blur'}],
-        disposal:[{required:true, message:'请选择', trigger:'change'}],
-        isTechnology:[{required:true, message:'请选择', trigger:'change'}],
+        planCnt: [{required: true, message: '请输入', trigger: 'blur'}],
+        disposal: [{required: true, message: '请选择', trigger: 'change'}],
+        isTechnology: [{required: true, message: '请选择', trigger: 'change'}]
       },
       dataList: [],
       dataListLoading: false
@@ -245,21 +245,21 @@ export default {
       this.$emit('onChose')
     },
     async init (item, readonly) {
-      let id = item.productionManagementId;
-      if(readonly){
+      let id = item.productionManagementId
+      if (readonly) {
         this.disabled = true
       }
 
       this.$http({
-            url: this.$http.adornUrl(`/biz-service/projProduction/info/${id}`),
-            method: 'get'
-          }).then(({data}) => {
-            if(data && data.code === '200'){
-              this.dataForm = data.data;
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
+        url: this.$http.adornUrl(`/biz-service/projProduction/info/${id}`),
+        method: 'get'
+      }).then(({data}) => {
+        if (data && data.code === '200') {
+          this.dataForm = data.data
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
     },
     validateField (type) {
       this.$refs.dataForm.validateField(type)
@@ -276,7 +276,7 @@ export default {
           let data = {
             orderCode: this.dataForm.orderCode,
             proProductList: this.dataForm.proProductList
-          };
+          }
 
           console.log('data', data)
 

src/views/modules/production/plan.vue

@@ -159,14 +159,14 @@
       getDataList () {
         this.dataListLoading = true
         this.addOrUpdateVisible = false
-  
+
         this.$http({
           url: this.$http.adornUrl(`/biz-service/projProduction/list`),
           method: 'get',
           params: this.$http.adornParams({
             'current': this.pageIndex,
             'size': this.pageSize,
-            'orderCode': this.dataForm.orderCode,
+            'orderCode': this.dataForm.orderCode
           })
         }).then(({data}) => {
           this.dataListLoading = false
@@ -200,7 +200,7 @@
           this.$refs.assign.init(item)
         })
       },
-      submitHandle(item, readonly) {
+      submitHandle (item, readonly) {
         this.submitVisible = true
         this.$nextTick(() => {
           this.$refs.submit.init(item, readonly)
@@ -208,17 +208,17 @@
       },
       formatState (row) {
         if (!row.state) return ''
-        
+
         return this.getStateStr(row.state)
       },
-      getStateStr(state){
+      getStateStr (state) {
         let option = this.stateOption.find(t => t.value === state)
         if (option != null) {
           return option.label
         }
         return ''
       },
-      noticeSettingHandle(){
+      noticeSettingHandle () {
         this.noticeChangeVisible = true
         this.$nextTick(() => {
           this.$refs.noticeChange.init()

src/views/modules/tech/project-product-detail.vue

@@ -30,7 +30,7 @@
         </el-col>
       </el-row>
 
-      <el-table 
+      <el-table
         :data="dataForm.proProductList"
         border
         v-loading="dataListLoading"
@@ -201,22 +201,22 @@ export default {
       this.$emit('onChose')
     },
     async init (item) {
-      let id = item.productTechnologyId;
+      let id = item.productTechnologyId
 
       this.$http({
-            url: this.$http.adornUrl(`/biz-service/projProduct/info/${id}`),
-            method: 'get'
-          }).then(({data}) => {
-            if(data && data.code === '200'){
-              this.dataForm = data.data;
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
+        url: this.$http.adornUrl(`/biz-service/projProduct/info/${id}`),
+        method: 'get'
+      }).then(({data}) => {
+        if (data && data.code === '200') {
+          this.dataForm = data.data
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
 
       this.dataForm = item
 
-      this.dataList = [{disposal:'', isTechnology:''}]
+      this.dataList = [{disposal: '', isTechnology: ''}]
 
       this.visible = true
     },

src/views/modules/tech/project-product.vue

@@ -173,7 +173,7 @@
       getDataList () {
         this.dataListLoading = true
         this.addOrUpdateVisible = false
-  
+
         this.$http({
           url: this.$http.adornUrl(`/biz-service/projProduct/list`),
           method: 'get',
@@ -283,17 +283,17 @@
       },
       formatState (row) {
         if (!row.state) return ''
-        
+
         return this.getStateStr(row.state)
       },
-      getStateStr(state){
+      getStateStr (state) {
         let option = this.stateOption.find(t => t.value === state)
         if (option != null) {
           return option.label
         }
         return ''
       },
-      noticeSettingHandle(){
+      noticeSettingHandle () {
         this.noticeChangeVisible = true
         this.$nextTick(() => {
           this.$refs.noticeChange.init()

src/views/modules/tech/project-tech-submit.vue

@@ -30,7 +30,7 @@
         </el-col>
       </el-row>
 
-      <el-table 
+      <el-table
         :data="dataForm.proProductList"
         border
         v-loading="dataListLoading"
@@ -200,12 +200,12 @@ export default {
       disabled: false,
       id: 0,
       dataForm: {
-        proProductList:[]
+        proProductList: []
       },
       dataRule: {
-        planCnt:[{required:true, message:'请输入', trigger:'blur'}],
-        disposal:[{required:true, message:'请选择', trigger:'change'}],
-        isTechnology:[{required:true, message:'请选择', trigger:'change'}],
+        planCnt: [{required: true, message: '请输入', trigger: 'blur'}],
+        disposal: [{required: true, message: '请选择', trigger: 'change'}],
+        isTechnology: [{required: true, message: '请选择', trigger: 'change'}]
       },
       dataList: [],
       dataListLoading: false,
@@ -219,21 +219,21 @@ export default {
       this.$emit('onChose')
     },
     async init (item, readonly) {
-      let id = item.technologyId;
-      if(readonly){
+      let id = item.technologyId
+      if (readonly) {
         this.disabled = true
       }
 
       this.$http({
-            url: this.$http.adornUrl(`/biz-service/projTechnology/info/${id}`),
-            method: 'get'
-          }).then(({data}) => {
-            if(data && data.code === '200'){
-              this.dataForm = data.data;
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
+        url: this.$http.adornUrl(`/biz-service/projTechnology/info/${id}`),
+        method: 'get'
+      }).then(({data}) => {
+        if (data && data.code === '200') {
+          this.dataForm = data.data
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
     },
     validateField (type) {
       this.$refs.dataForm.validateField(type)
@@ -250,7 +250,7 @@ export default {
           let data = {
             orderCode: this.dataForm.orderCode,
             proProductList: this.dataForm.proProductList
-          };
+          }
 
           console.log('data', data)
 

src/views/modules/tech/project-tech.vue

@@ -182,14 +182,14 @@
       getDataList () {
         this.dataListLoading = true
         this.addOrUpdateVisible = false
-  
+
         this.$http({
           url: this.$http.adornUrl(`/biz-service/projTechnology/list`),
           method: 'get',
           params: this.$http.adornParams({
             'current': this.pageIndex,
             'size': this.pageSize,
-            'orderCode': this.dataForm.orderCode,
+            'orderCode': this.dataForm.orderCode
           })
         }).then(({data}) => {
           this.dataListLoading = false
@@ -232,17 +232,17 @@
       },
       formatState (row) {
         if (!row.state) return ''
-        
+
         return this.getStateStr(row.state)
       },
-      getStateStr(state){
+      getStateStr (state) {
         let option = this.stateOption.find(t => t.value === state)
         if (option != null) {
           return option.label
         }
         return ''
       },
-      noticeSettingHandle(){
+      noticeSettingHandle () {
         this.noticeChangeVisible = true
         this.$nextTick(() => {
           this.$refs.noticeChange.init()