工艺规程管理

components/customTable/customTable.vue

@@ -290,6 +290,21 @@ export default {
           title: '紧急程度',
           key: 'urgencyLevel',
           width: 100,
+           filters: this.getArry(
+            this.$store.getters.dictionaryByKey('plan.order.urgencyLevel')
+          ),
+          filterMethod(value, row) {
+            return row.urgencyLevel.indexOf(value) > -1
+          },
+          render: (h, params) => {
+            return h('state', {
+              props: {
+                code: 'plan.order.urgencyLevel',
+                type: 'text',
+                value: params.row.urgencyLevel + ''
+              }
+            })
+          }
         },
         // {
         //   title: '任务类型',

pages/processManage/Process/detailfiles.vue

@@ -103,9 +103,9 @@ export default {
         service
           .post(
             `${url}`,
-            JSON.stringify({
+            {
               routingFile: dataValidate
-            })
+            }
           )
           .then((response) => {
             if (response.success) {

pages/processManage/Process/index.vue

@@ -226,7 +226,7 @@ export default {
       doUpload: '/api/up/file',
       tableHeight: '',
       myloading: true,
-      gymodaltitle: '创建主工艺',
+      gymodaltitle: '创建工艺',
       processviewModal: false,
       isview: false,
       issendAudit: false,
@@ -672,10 +672,10 @@ export default {
         service
           .post(
             `${url}`,
-            JSON.stringify({
+            {
               routingHeaderEntity: a.formValidate,
               FileList: filelist
-            })
+            }
           )
           .then((response) => {
             if (response.success) {

pages/processManage/Process/processNew.vue

@@ -544,9 +544,9 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+          {
             routingDetail: this.formprocessValidate
-          })
+          }
         )
         .then((response) => {
           if (response.success) {

pages/processManage/Process/stepModel.vue

@@ -171,9 +171,9 @@ let isvalidate = false;
         service
           .post(
             `${url}`,
-            JSON.stringify({
+           {
               routingStep: this.newModeldata
-            })
+            }
           )
           .then((response) => {
             if (response.success) {

pages/processManage/Process/supporting.vue

@@ -304,7 +304,7 @@ export default {
       var url = `${designUrl}/routingsupporting/createorupdate`
 
       service
-        .post(`${url}`, JSON.stringify(this.formprocessValidate))
+        .post(`${url}`, this.formprocessValidate)
         .then((response) => {
           if (response.success) {
             this.$Message.success('保存成功')

pages/processManage/Process/testingModel.vue

@@ -353,9 +353,9 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+         {
             routingQcCard: this.cardModeldata
-          })
+          }
         )
         .then((response) => {
           if (response.success) {

pages/processManage/setProcess/index.vue

@@ -389,7 +389,7 @@ export default {
       list: [],
       data2: [],
       tabstatus: '1', //暂存tab状态（）主工艺||专业工艺
-      gymodaltitle: '创建主工艺',
+      gymodaltitle: '创建工艺',
       selectdata: [],
       value1: false,
       drawerShow: false,
@@ -1076,9 +1076,7 @@ export default {
     saveHeader(next) {
       var a = this.$refs.processMain
 
-      if (a.formValidate.routingType == 1) {
-        this.savebill()
-      }
+     
 
       var filelist = a.getfile()
       let isvalidate = false
@@ -1107,10 +1105,10 @@ export default {
         service
           .post(
             `${url}`,
-            JSON.stringify({
+            {
               routingHeaderEntity: a.formValidate,
               FileList: filelist
-            })
+            }
           )
           .then((response) => {
             if (response.success) {
@@ -1209,9 +1207,7 @@ export default {
           this.$refs.processNew.formprocessValidate.routing_header_id = this.headerid
           this.$refs.processNew.loaddata()
         } else {
-          if (this.addpdefm.formValidate.routingType == 1) {
-            this.savebill()
-          }
+          
 
           var a = this.addpdefm
           this.headerid = this.addpdefm.formValidate.id
@@ -1231,9 +1227,9 @@ export default {
           service
             .post(
               `${url}`,
-              JSON.stringify({
+              {
                 orderRouting: orderRoutingobj
-              })
+              }
             )
             .then((response) => {
               if (response.success) {
@@ -1296,15 +1292,12 @@ export default {
     modalShowCancel() {
       this.modalShow = false
     },
-    savebill() {
-      this.$refs.modelTable.$refs.quotationBox2.saveData()
-      this.$refs.modelTable.$refs.quotationBox3.saveData()
-    },
+   
     saveOK() {
       var url = `${PlanUrl}/OrderMaterial/createorupdate`
       // JSON.stringify({Process:this.formValidate})
       service
-        .post(`${url}`, JSON.stringify({ orderMaterial: this.formValidate }))
+        .post(`${url}`, { orderMaterial: this.formValidate })
         .then((response) => {
           if (response.success) {
             this.$Message.success('保存成功')
@@ -1334,7 +1327,7 @@ export default {
       let ordercombid = 0
       this.createtype = 1
       if (routingType == 1) {
-        this.gymodaltitle = '设置主工艺规程'
+        this.gymodaltitle = '设置工艺规程'
 
         for (let i = 0; i < this.data1.length; i++) {
           let obj1 = this.data1[i]
@@ -1346,24 +1339,14 @@ export default {
           }
         }
 
-        this.$refs.modelTable.issetProcess1 = true
-        this.$refs.modelTable.selectFault = 'greateArt'
-
-        this.$refs.modelTable.$refs.quotationBox2.loadData(
-          orderids.toString(',')
-        )
-        this.$refs.modelTable.$refs.quotationBox3.loadData(
-          orderids.toString(',')
-        )
-
-        this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
-        this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
+    
+     
       } else {
-        this.$refs.modelTable.issetProcess1 = false
+     
         this.gymodaltitle = '设置专业工艺规程'
         ordercombid = params.row.specialtyOrderCombID
         if (ordercombid != 0) {
-          this.$refs.modelTable.issetProcess1 = false
+         
           this.addpdefm.formValidate.ordercombid = ordercombid
           for (let i = 0; i < this.data1.length; i++) {
             let obj = this.data1[i]
@@ -1450,16 +1433,9 @@ export default {
       let orderids = new Array()
       let orderlist = new Array()
 
-      if (routingType == 1) {
-        // ordercombid = params.row.orderCombID
-        this.$refs.modelTable.issetProcess1 = true
-
-        this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
-        this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
-      } else {
-        //  ordercombid = params.row.specialtyOrderCombID
-        this.$refs.modelTable.issetProcess1 = false
-      }
+    
+         ordercombid = params.row.orderCombID
+       
       this.addpdefm.formValidate.ordercombid = ordercombid
       if (orders == null) {
         for (let i = 0; i < this.data1.length; i++) {
@@ -1493,13 +1469,8 @@ export default {
       this.addpdefm.dataTop = orderlist
 
       if (routingType == 1) {
-        this.$refs.modelTable.$refs.quotationBox2.loadData(
-          orderids.toString(',')
-        )
-        this.$refs.modelTable.$refs.quotationBox3.loadData(
-          orderids.toString(',')
-        )
-        this.$refs.modelTable.selectFault = 'greateArt'
+      
+        
       }
       if (routingType == 1) {
         this.gymodaltitle = '设置工艺规程'
@@ -1539,13 +1510,9 @@ export default {
       let orderids = new Array()
       let orderlist = new Array()
       let ordercombid = 0
-      if (routingType == 1) {
+    
         ordercombid = params.row.orderCombID
-        this.$refs.modelTable.issetProcess1 = true
-      } else {
-        ordercombid = params.row.specialtyOrderCombID
-        this.$refs.modelTable.issetProcess1 = false
-      }
+      
       this.addpdefm.formValidate.ordercombid = ordercombid
       for (let i = 0; i < this.data1.length; i++) {
         let obj = this.data1[i]
@@ -1568,22 +1535,10 @@ export default {
       }
       this.addpdefm.dataTop = orderlist
 
-      if (routingType == 1) {
-        this.$refs.modelTable.$refs.quotationBox2.loadData(
-          orderids.toString(',')
-        )
-        this.$refs.modelTable.$refs.quotationBox3.loadData(
-          orderids.toString(',')
-        )
-        this.$refs.modelTable.selectFault = 'greateArt'
-        this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
-        this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
-      }
-      if (routingType == 1) {
-        this.gymodaltitle = '查看工艺规程'
-      } else {
+      
+     
         this.gymodaltitle = '查看工艺规程'
-      }
+     
       var url = `${designUrl}/routingheader/getbyid?id=` + RoutingID
       service.get(`${url}`).then((response) => {
         this.addpdefm.formValidate = response.result
@@ -1613,9 +1568,7 @@ export default {
       this.addpdefm.formValidate = this.headerInfo
 
       this.addpdefm.isview = this.isview
-      this.$refs.modelTable.$refs.quotationBox2.isview = this.isview
-      this.$refs.modelTable.$refs.quotationBox3.isview = this.isview
-
+      
       this.addpdefm.ProductName = this.headerInfo.productName
       this.addpdefm.ProductCode = this.headerInfo.productCode
 

pages/processManage/setProcess/processMain.vue

@@ -445,36 +445,7 @@ export default {
       this.$refs.refFile.routing_header_id = 0;
       this.$refs.refFile.intFiles();
     },
-    LoadprocessList() {
-      this.processList = [];
-      let url = `${designUrl}/routingheader/getlistbyids?` + this.Mianids,
-        that = this;
-      service.get(`${url}`).then(res => {
-        let selectdata = res.result;
-
-        selectdata.forEach(item => {
-          this.processList.push({
-            value: item.id,
-            name: item.code,
-            ver: item.version
-          });
-        });
-        this.formValidate.up_id = this.processList[0].value;
-        this.MianVer = this.processList[0].ver;
-        this.MianCode = this.processList[0].name;
-      });
-    },
-    MainProcess_selected(val) {
-      //这里的val默认拿到的是：value绑定的那个
-
-      this.formValidate.up_id = val;
-
-      this.processList.forEach(item => {
-        if (val == item.value) {
-          this.MianVer = item.ver;
-        }
-      });
-    },
+    
     quotationBox() {
       this.$refs.generateQuotation.modalShow = true;
     },
@@ -558,9 +529,10 @@ export default {
       });
     },
     setparentcreatetype(type, headerid) {
+      
+       this.$parent.$parent.createtype = type
+       this.$parent.$parent.headerid = headerid
      
-        this.$parent.$parent.$parent.createtype = type;
-        this.$parent.$parent.$parent.headerid = headerid;
       
     },
 
@@ -575,11 +547,9 @@ export default {
       });
     },
     setshow() {
-      if (this.formValidate.routingType == 2) {
-        this.isshow = true;
-      } else {
+     
         this.isshow = false;
-      }
+      
 
       if (this.formValidate.id != 0) {
         this.isedit = true;
@@ -590,14 +560,11 @@ export default {
         this.Loadfile(0);
       }
 
-      if (this.Mianids != "") {
-        this.LoadprocessList();
-      }
-
+  
       this.createtype = "1";
       this.selectpdefmid = 0;
       this.RoutingList = [];
-      this.calcplatesnum();
+     // this.calcplatesnum();
     }
   }
 };