Merge branch 'master' of http://git.mes123.com/zhouyx/mes-ui into qin

components/page/dataGrid.vue

@@ -496,6 +496,11 @@ export default {
       })
       return cols
     }
+  },
+  watch:{
+    "data.length"(){
+      this.list=this.data;
+    }
   }
 }
 </script>

pages/aps/aps/components/excute.vue

@@ -4,7 +4,6 @@
       style="margin-top:-25px;margin-bottom:-25px"
       :columns="columns"
       ref="grid"
-      :action="action"
       :easy="false"
       :high="false"
       :set="false"
@@ -330,110 +329,7 @@ export default {
           }
         }
       ],
-      data1: [
-        {
-          id: "1",
-          op_task_pk: "001",
-          part_task_pk: "001",
-          task_seq: "1",
-          task_name: "测试工序1",
-          put_into_qty: "10",
-          plan_start: "04/05/2020",
-          plan_finish: "06/05/2020",
-          setup_time: "5",
-          run_time: "1",
-          transport_time: "1",
-          check_time: "1",
-          efficiency_value: "0.5",
-          singleout: "2",
-          first_equip: "NTY-0012",
-          equip_type: "加工设备",
-          cal_id: "日历id",
-          machine_rule: "优先",
-          plan_method: "是",
-          over_time: "1",
-          isdiscrete: "是",
-          discrete_value: "1.2",
-          multi_machine: "5",
-          notes: "暂无备注信息test",
-          insert_flag: 1,
-          outside_time: "04/06/2020",
-          taskseq_des: "",
-          workshopcode: "",
-          routing_detail_id: "",
-          routing_header_id: "",
-          comb_param: "",
-          rule_qty: ""
-        },
-        {
-          id: "2",
-          op_task_pk: "002",
-          part_task_pk: "002",
-          task_seq: "2",
-          task_name: "测试工序2",
-          put_into_qty: "10",
-          plan_start: "04/05/2020",
-          plan_finish: "06/05/2020",
-          setup_time: "5",
-          run_time: "1",
-          transport_time: "1",
-          check_time: "1",
-          efficiency_value: "0.5",
-          singleout: "2",
-          first_equip: "NTY-0012",
-          equip_type: "加工设备",
-          cal_id: "日历id",
-          machine_rule: "优先",
-          plan_method: "是",
-          over_time: "1",
-          isdiscrete: "是",
-          discrete_value: "1.2",
-          multi_machine: "5",
-          notes: "暂无备注信息test",
-          insert_flag: 0,
-          outside_time: "04/06/2020",
-          taskseq_des: "",
-          workshopcode: "",
-          routing_detail_id: "",
-          routing_header_id: "",
-          comb_param: "",
-          rule_qty: ""
-        },
-        {
-          id: "3",
-          op_task_pk: "003",
-          part_task_pk: "003",
-          task_seq: "3",
-          task_name: "测试工序3",
-          put_into_qty: "10",
-          plan_start: "04/05/2020",
-          plan_finish: "06/05/2020",
-          setup_time: "5",
-          run_time: "1",
-          transport_time: "1",
-          check_time: "1",
-          efficiency_value: "0.5",
-          singleout: "2",
-          first_equip: "NTY-0012",
-          equip_type: "加工设备",
-          cal_id: "日历id",
-          machine_rule: "优先",
-          plan_method: "是",
-          over_time: "1",
-          isdiscrete: "是",
-          discrete_value: "1.2",
-          multi_machine: "5",
-          notes: "暂无备注信息test",
-          insert_flag: 0,
-          outside_time: "04/06/2020",
-          taskseq_des: "",
-          workshopcode: "",
-          routing_detail_id: "",
-          routing_header_id: "",
-          comb_param: "",
-          rule_qty: ""
-        }
-      ],
+      data1: [],
       insertTItle: "插单"
     };
   },
@@ -449,9 +345,8 @@ export default {
       let params = {
         id: expendId
       }
-      Api.getbyorderid(params).then(res => {
-        if (res.sucess) {
-          this.data1 = [];
+      Api.getbyorderid(params).then((res) => {
+        if (res.success) {
           this.data1 = res.result;
         }
       });

pages/aps/aps/index.vue

@@ -40,11 +40,11 @@
   </div>
 </template>
 <script>
-import Api from './api'
-import Add from './add'
-import Expand from './components/excute'
+import Api from "./api";
+import Add from "./add";
+import Expand from "./components/excute";
 export default {
-  name: 'list',
+  name: "list",
   components: {
     Add,
     Expand
@@ -53,252 +53,248 @@ export default {
     return {
       action: Api.index,
       easySearch: {
-        keys: { op: 'notes', value: null }
+        keys: { op: "notes", value: null }
       },
       addModal: false,
       editModal: false,
       detailModal: false,
       deletelModal: false,
       apsModal: false,
-      list: [
-      ],
+      list: [],
       curId: 0,
       columns: [
         {
-          key: 'move',
-          title: ' ',
+          key: "move",
+          title: " ",
           hide: false,
-          align: 'center',
+          align: "center",
           width: 30,
           render: (h, params) => {
-            return h('Icon', {
+            return h("Icon", {
               attrs: {
-                type: 'md-more',
+                type: "md-more",
                 size: 18
               },
-              class: 'drag'
-            })
+              class: "drag"
+            });
           }
         },
         {
-          type: 'expand',
+          type: "expand",
           width: 50,
           render: (h, params) => {
             return h(Expand, {
               props: {
-                rowId: params.row.id
+                rowId: params.row.part_task_pk
               }
-            })
+            });
           }
         },
         {
-          key: 'selection',
-          type: 'selection',
+          key: "selection",
+          type: "selection",
           width: 50,
-          align: 'center'
+          align: "center"
         },
         {
-          key: 'id',
-          title: this.l('id'),
+          key: "id",
+          title: this.l("id"),
           hide: true,
-          align: 'left',
+          align: "left",
           sortable: true,
           width: 50
         },
         {
-          key: 'insert_flag',
-          title: this.l('insert_flag'),
-          align: 'center',
+          key: "insert_flag",
+          title: this.l("insert_flag"),
+          align: "center",
           width: 70,
           high: true,
-          code: 'aps.aps.insert_flag',
-          category: 'icon'
+          code: "aps.aps.insert_flag",
+          category: "icon"
         },
         {
-          key: 'part_task_pk',
-          title: this.l('part_task_pk'),
-          align: 'left',
+          key: "part_task_pk",
+          title: this.l("part_task_pk"),
+          align: "left",
           high: true
         },
         {
-          key: 'priority',
-          title: this.l('priority'),
-          align: 'left',
+          key: "priority",
+          title: this.l("priority"),
+          align: "left",
           high: true
         },
         {
-          key: 'plan_qty',
-          title: this.l('plan_qty'),
-          align: 'left',
+          key: "plan_qty",
+          title: this.l("plan_qty"),
+          align: "left",
           high: true,
           sortable: true
         },
         {
-          key: 'spare_qty',
-          title: this.l('spare_qty'),
-          align: 'left',
+          key: "spare_qty",
+          title: this.l("spare_qty"),
+          align: "left",
           high: true
         },
         {
-          key: 'plan_start',
-          title: this.l('plan_start'),
-          align: 'center',
+          key: "plan_start",
+          title: this.l("plan_start"),
+          align: "center",
           high: true,
           resizable: true,
           width: 140
         },
         {
-          key: 'plan_finish',
-          title: this.l('plan_finish'),
-          align: 'center',
+          key: "plan_finish",
+          title: this.l("plan_finish"),
+          align: "center",
           high: true,
           sortable: true,
           resizable: true,
           width: 140
         },
         {
-          key: 'notes',
-          title: this.l('notes'),
-          align: 'left',
+          key: "notes",
+          title: this.l("notes"),
+          align: "left",
           easy: true,
           high: true,
           hide: true
         },
         {
-          key: 'demand_start',
-          title: this.l('demand_start'),
-          align: 'center',
+          key: "demand_start",
+          title: this.l("demand_start"),
+          align: "center",
           hide: true,
           resizable: true,
           width: 100
         },
         {
-          key: 'demand_finish',
-          title: this.l('demand_finish'),
-          align: 'center',
+          key: "demand_finish",
+          title: this.l("demand_finish"),
+          align: "center",
           high: true,
           resizable: true,
           width: 140
         },
         {
-          key: 'badjustflag',
-          title: this.l('badjustflag'),
-          align: 'left',
+          key: "badjustflag",
+          title: this.l("badjustflag"),
+          align: "left",
           high: true
         },
         {
-          title: '操作',
-          key: 'action',
+          title: "操作",
+          key: "action",
           width: 140,
-          align: 'center',
+          align: "center",
           // fixed:"right",
           render: (h, params) => {
-            return h('div', { class: 'action' }, [
-              h('op', {
+            return h("div", { class: "action" }, [
+              h("op", {
                 attrs: {
-                  icon: 'md-options',
-                  type: 'icon',
-                  title: '工序参数设置'
+                  icon: "md-options",
+                  type: "icon",
+                  title: "工序参数设置"
                 },
                 on: { click: () => this.openParms(params.row.id) }
               }),
-              h('op', {
+              h("op", {
                 attrs: {
-                  icon: 'md-return-left',
-                  type: 'icon',
-                  title: '移出排产池',
-                  oprate: 'delete',
-                  msg: '确认要移出排产吗？'
+                  icon: "md-return-left",
+                  type: "icon",
+                  title: "移出排产池",
+                  oprate: "delete",
+                  msg: "确认要移出排产吗？"
                 },
                 on: { click: () => this.remove(params.row.id) }
               }),
-              h('op', {
+              h("op", {
                 attrs: {
-                  icon: 'md-refresh',
-                  type: 'icon',
-                  title: '恢复工序',
-                  oprate: 'delete',
-                  msg: '确认要恢复工序吗？'
+                  icon: "md-refresh",
+                  type: "icon",
+                  title: "恢复工序",
+                  oprate: "delete",
+                  msg: "确认要恢复工序吗？"
                 },
                 on: { click: () => this.remove(params.row.id) }
               })
-            ])
+            ]);
           }
         }
       ]
-    }
+    };
   },
   mounted() {
-    this.loadList()
-
+    this.loadList();
   },
   async fetch({ store, params }) {
-    await store.dispatch('loadDictionary') // 加载数据字典
+    await store.dispatch("loadDictionary"); // 加载数据字典
   },
   methods: {
     //排产池加载数据列表
-    loadList()
-    {
-      Api.getall().then((res)=>{
-        if(res.success)
-        {
-          this.list=res.result
+    loadList() {
+      Api.getall().then(res => {
+        if (res.success) {
+          this.list = res.result;
         }
-      })
+      });
     },
     addOk() {
-      this.$refs.grid.load()
-      this.addModal = false
-      this.detailModal = false
-      this.editModal = false
-      this.curId = 0
+      this.$refs.grid.load();
+      this.addModal = false;
+      this.detailModal = false;
+      this.editModal = false;
+      this.curId = 0;
     },
     detail(id) {
-      this.detailModal = true
-      this.curId = id
+      this.detailModal = true;
+      this.curId = id;
     },
     edit(id) {
-      this.editModal = true
-      this.curId = id
+      this.editModal = true;
+      this.curId = id;
     },
 
     remove(id) {
-      this.deletelModal = true
-      this.curId = id
+      this.deletelModal = true;
+      this.curId = id;
     },
     onSelect(a, b) {},
     removeOk() {
-      Api.delete({ id: this.curId }).then((r) => {
+      Api.delete({ id: this.curId }).then(r => {
         if (r.success) {
-          this.$refs.grid.load()
-          this.deletelModal = false
-          this.$Message.success('删除成功')
+          this.$refs.grid.load();
+          this.deletelModal = false;
+          this.$Message.success("删除成功");
         }
-      })
+      });
     },
     removeCancel() {
-      this.deletelModal = false
+      this.deletelModal = false;
     },
     cancel() {
-      this.curId = 0
-      this.addModal = false
-      this.detailModal = false
-      this.editModal = false
-      this.deletedlModal = false
-      this.apsModal = false
+      this.curId = 0;
+      this.addModal = false;
+      this.detailModal = false;
+      this.editModal = false;
+      this.deletedlModal = false;
+      this.apsModal = false;
     },
     onDragDrop(a, b) {
-      this.list.splice(b, 1, ...this.list.splice(a, 1, this.list[b]))
+      this.list.splice(b, 1, ...this.list.splice(a, 1, this.list[b]));
     },
     openParms(id) {
-      this.addModal = true
+      this.addModal = true;
     },
     l(key) {
-      let vkey = 'mes_part_task_plan_simulate' + '.' + key
-      return this.$t(vkey) || key
+      let vkey = "mes_part_task_plan_simulate" + "." + key;
+      return this.$t(vkey) || key;
     }
   }
-}
+};
 </script>
 <style lang="less">
 .drag {

pages/aps/plan/index.vue

@@ -457,10 +457,6 @@ export default {
           }
         }
       });
-      this.$router.push({
-        name: "aps-aps"
-        // params: { customerId: id }
-      });
     },
     addOk() {
       this.$refs.grid.load();

pages/basicData/code/index.vue

@@ -65,7 +65,7 @@ export default {
         {
           title: "序号",
           type: "index",
-          width: 60,
+          width: 65,
           align: "center"
         },
         {

pages/implement/components/entryMovie.vue

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

pages/implement/components/entryPause.vue

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

pages/implement/components/entryrecordMovie.vue

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

pages/implement/components/entryrecorddata.vue

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

pages/implement/components/entryrecordfiles.vue

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

pages/implement/components/processRecord.vue

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

pages/implement/components/productReport.vue

@@ -499,11 +499,11 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+          {
             dispatch_id: this.datasearch.entryID,
             order_id: this.datasearch.order_id,
             list: datalist
-          })
+          }
         )
         .then((response) => {
           if (response.success) {

pages/implement/components/sendCheck.vue

@@ -115,7 +115,7 @@ export default {
       if (state) {
         var url = `${PlanUrl}/ordercheckresult/sendcheck`
         service
-          .post(`${url}`, JSON.stringify(this.user))
+          .post(`${url}`, this.user)
           .then((response) => {
             if (response.success) {
               this.$Message.success('保存成功')

pages/implement/components/usercard.vue

@@ -71,7 +71,7 @@ export default {
       }
 
       service
-        .post(`${systemUrl}/user/list`, JSON.stringify(params))
+        .post(`${systemUrl}/user/list`, params)
         .then((response) => {
           if (response.result.length > 0) {
             this.user.user_name = response.result[0].userName
@@ -139,10 +139,10 @@ export default {
             service
               .post(
                 `${url}`,
-                JSON.stringify({
+               {
                   user: this.user,
                   card: this.recordList
-                })
+                }
               )
               .then((response) => {
                 if (response.success) {
@@ -185,7 +185,7 @@ export default {
       }
 
       this.product_ID.push(fillModel.product_ID)
-      console.log(fillModel.board_ID);
+      
       this.board_ID.push(fillModel.board_ID)
       if (
         fillModel.fill_in_user_type == 1 ||
@@ -238,9 +238,10 @@ export default {
     },
     getCurrentUser(e) {
       if (e) {
-        let userInfo = this.$store.admin.user.info;
+        let userInfo = this.$store.state.userInfo;
+       console.log(userInfo);
         this.user.cardno = userInfo.login_id
-        this.user.user_name = localStorage.getItem('userName')
+        this.user.user_name = userInfo.name
         this.user.user_id = userInfo.userId
       } else {
         this.user.cardno = ''

pages/implement/index.vue

@@ -541,11 +541,11 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+          {
             id: row.id,
             orderid: this.data.orderIDs,
             time: null
-          })
+          }
         )
         .then((response) => {
           if (response.success) {
@@ -566,11 +566,11 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+         {
             id: row.id,
             orderid: this.data.orderIDs,
             time: null
-          })
+          }
         )
         .then((response) => {
           if (response.success) {

pages/order/quotation/components/quotationBox.vue

@@ -402,7 +402,7 @@ th.conciseContent .ivu-table-cell {
   padding: 0px !important;
 }
 .ivu-table-cell {
-  padding: 0px !important;
+  /* padding: 0px !important; */
 }
 </style>>
 

pages/order/quotation/index.vue

@@ -458,7 +458,7 @@ export default {
         this.recordColumn = [
           {
             type: "index",
-            width: 60,
+            width: 65,
             title: "序号",
             align: "center"
           },

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,
@@ -557,7 +557,7 @@ export default {
               content = gh[0].name
               editColor = gh[0].color
             }
-            if (this.tabstatus == '1') {
+          
               return h('div', [
                 h(
                   'span',
@@ -601,24 +601,7 @@ export default {
                   content
                 )
               ])
-            } else {
-              return h('div', [
-                h(
-                  'span',
-                  {
-                    props: {
-                      type: 'text',
-                      ghost: true
-                    },
-                    style: {
-                      color: editColor,
-                      cursor: 'pointer'
-                    }
-                  },
-                  content
-                )
-              ])
-            }
+           
           }
         },
         
@@ -1076,9 +1059,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 +1088,10 @@ export default {
         service
           .post(
             `${url}`,
-            JSON.stringify({
+            {
               routingHeaderEntity: a.formValidate,
               FileList: filelist
-            })
+            }
           )
           .then((response) => {
             if (response.success) {
@@ -1209,9 +1190,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 +1210,9 @@ export default {
           service
             .post(
               `${url}`,
-              JSON.stringify({
+              {
                 orderRouting: orderRoutingobj
-              })
+              }
             )
             .then((response) => {
               if (response.success) {
@@ -1296,15 +1275,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 +1310,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 +1322,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]
@@ -1431,12 +1397,11 @@ export default {
       this.addpdefm.setshow()
     },
     editProcessRow(params, RoutingID, routingType) {
+    
       let ordercombid = 0
-      if (routingType == 1) {
+    
         ordercombid = params.row.orderCombID
-      } else {
-        ordercombid = params.row.specialtyOrderCombID
-      }
+     
       this.editProcess(ordercombid, RoutingID, routingType, null)
     },
     editProcess(ordercombid, RoutingID, routingType, orders) {
@@ -1450,16 +1415,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
-      }
+    
+       
+       
       this.addpdefm.formValidate.ordercombid = ordercombid
       if (orders == null) {
         for (let i = 0; i < this.data1.length; i++) {
@@ -1492,15 +1450,7 @@ 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 = '设置工艺规程'
       } else {
@@ -1539,13 +1489,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 +1514,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 +1547,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();
     }
   }
 };

pages/produce/components/expend.vue

@@ -145,7 +145,7 @@ export default {
 <style lang='less' scoped>
 .material_row{
     .material_label{
-        color: #249E91
+        color: #2d8cf0
     }
     .material_line {
         display: inline-block;

pages/produce/ordermaterial.vue

@@ -360,8 +360,7 @@ export default {
     },
     // 分页查询数据列表
     laoedPage() {
-
- let params = this.orderSearchForm
+      let params = this.orderSearchForm
       params.SkipCount = params.SkipCount || 0
       params.MaxResultCount = params.MaxResultCount || 10
 

pages/qc/taskList/index.vue

@@ -8,7 +8,7 @@
           v-model="searchIterms" placeholder="请输入查询条件"
           @on-search="tableSearch" ></Input>
       </div>
-      <Button type="primary" class="title_btn" @click='searchModel'>高级查询</Button>
+      <Button type="primary" class="title_btn" v-show="false" @click='searchModel'>高级查询</Button>
     </div>
     <div class="table">
       <Table
@@ -333,6 +333,7 @@ export default {
       searchlaode(parmes){
         let url = `${PlanUrl}/ordercheck/waitexecuteorderlist`;
         service.post(`${url}`,parmes).then(res => {
+          console.warn(res)
             this.mDatas = res.result.items
             this.search.total = res.result.totalCount
         });
@@ -415,7 +416,7 @@ export default {
 <style scoped>
 .table_title{
   width: 320px;
-  float: left;
+  /* float: left; */
 }
 .table{
   margin: 10px 0 0 0;

pages/qcimplement/components/backCheck.vue

@@ -92,7 +92,7 @@ export default {
       if (state) {
         var url = `${PlanUrl}/ordercheckresult/savecheckresult`
         service
-          .post(`${url}`, JSON.stringify(this.mod))
+          .post(`${url}`, this.mod)
           .then((response) => {
             if (response.success) {
               this.$Message.success('操作成功')

pages/qcimplement/index.vue

@@ -30,7 +30,7 @@
     </div>
     <div class="transmit_content">
       <div class="wuliao_left">
-        <div class="card_title" style="height:32px">
+        <div class="card_title" style="height:46px">
           <a href="#" class="state" @click="showList">
             状态：
             <Icon type="ios-arrow-down" v-if="iconModel" />
@@ -388,11 +388,11 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+         {
             id: row.id,
             orderid: this.data.orderIDs,
             time: null
-          })
+          }
         )
         .then((response) => {
           if (response.success) {
@@ -413,11 +413,11 @@ export default {
       service
         .post(
           `${url}`,
-          JSON.stringify({
+          {
             id: row.id,
             orderid: this.data.orderIDs,
             time: null
-          })
+          }
         )
         .then((response) => {
           if (response.success) {