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

pages/aps/aps/api.js

@@ -84,6 +84,14 @@ export default {
   getEquiptypeList(params) {
     return Api.get(`${apsUrl}/mes_equip_info/getequiptypelist`, params);
   },
+  // 行内编辑保存 /mes_op_task_plan_simulate/updatesetuptimeandfirstequip
+  subupdate(params) {
+    return Api.post(`${apsUrl}/mes_op_task_plan_simulate/updatesetuptimeandfirstequip`, params);
+  },
+  // 选中是否同步到原始工艺  保存
+  apsupdate(params) {
+    return Api.post(`${designUrl}/routingdetail/apsupdate`, params);
+  },
   //获取任务工单相关设备
   gettaskequips(params) {
     return Api.get(`${apsUrl}/ser/gettaskequips`, params);

pages/aps/aps/components/edit.vue

@@ -3,12 +3,12 @@
     <Row>
       <Col :span="12">
         <FormItem :label="l('tASKSEQ')" prop="tASKSEQ">
-          <Input></Input>
+          <span>{{entity.task_seq}}</span>
         </FormItem>
       </Col>
       <Col :span="12">
         <FormItem :label="l('tASKNAME')" prop="tASKNAME">
-          <Input></Input>
+          <span>{{entity.task_name}}</span>
         </FormItem>
       </Col>
       <Col :span="12"> 
@@ -83,22 +83,24 @@ export default {
   },
   props: {
     eid: Number,
+    parmse: String,
   },
   created() {
     // this.getUserDepart()
   },
   methods: {
-    load() {
-      //   Api.get({ id: v }).then((r) => {
-      //     this.entity = r.result
-      //     this.$emit('on-load')
-      //   })
-    },
+    // load(v) {
+    //     Api.get({ id: v }).then((r) => {
+    //       console.log(r)
+    //       // this.entity = r.result
+    //       // this.$emit('on-load')
+    //     })
+    // },
     handleSubmit() {
       this.$refs.form.validate((v) => {
         if (v) {
           this.disabled = true
-          Api.update(this.entity)
+          Api.subupdate(this.entity)
             .then((r) => {
               this.disabled = false
               if (r.success) {
@@ -164,6 +166,12 @@ export default {
       if (v != 0) {
         this.load(v)
       }
+    },
+    parmse(u){
+      console.log(u)
+      if(u){
+        this.entity = u
+      }
     }
   }
 }

pages/aps/aps/components/excute.vue

@@ -14,7 +14,7 @@
     ></DataGrid>
 
     <Modal v-model="editModal" title="编辑" footer-hide width="800">
-      <Edit ref="editPart" :eid="curId" @on-close="cancel" />
+      <Edit ref="editPart" :eid="curId" :parmse="formData" @on-close="cancel" />
     </Modal>
     <Modal v-model="insertlModal" title="插单" @on-ok="insertOk" @on-cancel="cancel">
       <p>确定进行 {{insertTItle}} 操作？</p>
@@ -52,6 +52,7 @@ export default {
       detailModal: false,
       insertlModal: false,
       rowIndex: null,
+      formData: {},//编辑行数据
       curId: 0,
       gridHeight: 50,
       columns: [
@@ -316,7 +317,7 @@ export default {
                   msg: "确认要移出排产吗？"
                 },
                 class: "icons-h",
-                on: { click: () => this.edit(params.row.id) }
+                on: { click: () => this.edit(params.row) }
               }),
               h("op", {
                 attrs: {
@@ -393,25 +394,26 @@ export default {
     //单个工序进行参数设置end----
 
     //编辑工序start----
-    edit(id) {
+    edit(dataForm) {
       this.editModal = true;
-      this.curId = Number(id);
-      this.getUserDepart();
-      this.getEquiptypeList();
+      this.formData = dataForm
+      // this.curId = Number(id);
+      this.getUserDepart()
+      this.getEquiptypeList()
     },
     // 获取班组
-    getUserDepart() {
-      Api.getUserDepart().then(res => {
-        console.log(res.result);
-        this.$refs.editPart.orderCatList = res.result;
-      });
+    getUserDepart(){
+      Api.getUserDepart().then(res=>{
+        // console.log(res.result)
+        this.$refs.editPart.orderCatList = res.result
+      })
     },
     // 获取设备
-    getEquiptypeList() {
-      Api.getEquiptypeList().then(res => {
-        console.log("设备", res.result);
-        this.$refs.editPart.equiptypeList = res.result;
-      });
+    getEquiptypeList(){
+      Api.getEquiptypeList().then(res=>{
+        // console.log("设备",res.result)
+        this.$refs.editPart.equiptypeList = res.result
+      })
     },
     //编辑工序end----