Merge branch 'kk_mes'

pages/aps/aps/components/edit.vue

@@ -3,35 +3,27 @@
     <Row>
       <Col :span="12">
         <FormItem :label="l('tASKSEQ')" prop="tASKSEQ">
-          <span>{{entity.task_seq}}</span>
+          <b>{{entity.task_seq}}</b>
         </FormItem>
       </Col>
       <Col :span="12">
         <FormItem :label="l('tASKNAME')" prop="tASKNAME">
-          <span>{{entity.task_name}}</span>
+          <b>{{entity.task_name}}</b>
         </FormItem>
       </Col>
-      <Col :span="12"> 
+      <Col :span="12">
         <FormItem label="班组" prop="sHOPID">
-           <!-- v-model="orderSearchForm.orderCat" -->
-          <Select v-model="entity.department_id">
-              <Option
-                v-for="(item,index) in list"
-                :key="index"
-                :value="item.value"
-                style="display:none"
-                :label="item.label"
-              ></Option>
-              <Tree key="mytree" :data="orderCatList" ref="mytree" :render="renderContent"></Tree>
-              <!-- <Option v-for="(item,index) in orderCatList"   :value="item.title" :key="index">{{ item.title }}</Option> -->
-          </Select>
+          <DepartmentSelect v-model="entity.department_id" @on-change="deprtChange" />
         </FormItem>
       </Col>
       <Col :span="12">
         <FormItem label="首选设备" prop="eQUIPID">
           <Select placeholder="编号 / 名称">
-              <Option value="" class="option-text">编号 / 名称</Option>
-              <Option v-for="(item,index) in equiptypeList"   :value="item.id" :key="index">{{ item.equipTypeName }}</Option>
+            <Option
+              v-for="(item,index) in equiptypeList"
+              :value="item.id"
+              :key="index"
+            >{{ item.equipTypeName }}</Option>
           </Select>
         </FormItem>
       </Col>
@@ -42,17 +34,17 @@
               <Option v-for="item in orderCatList"   :value="item" :key="item">{{ item }}</Option>
           </Select>
         </FormItem>
-      </Col> -->
+      </Col>-->
       <Col :span="12">
         <FormItem :label="l('rUNTIME')" prop="rUNTIME">
-           <!-- v-model="value1" -->
+          <!-- v-model="value1" -->
           <InputNumber :max="100" :min="1"></InputNumber>
         </FormItem>
       </Col>
       <Col :span="12">
         <FormItem>
-           <!-- v-model="single" -->
-          <Checkbox>  是否同步到原始工艺</Checkbox>
+          <!-- v-model="single" -->
+          <Checkbox>是否同步到原始工艺</Checkbox>
         </FormItem>
       </Col>
     </Row>
@@ -63,27 +55,27 @@
   </Form>
 </template>
 <script>
-import Api from '../api'
+import Api from "../api";
 export default {
-  name: 'Edit',
+  name: "Edit",
   data() {
     return {
       disabled: false,
       entity: {
-        department_id: null, //班组
+        department_id: null //班组
       },
-      list:[],
+      list: [],
       selectdata: [],
-      orderCatList:[],//班组
-      equiptypeList:[],//设备
+      orderCatList: [], //班组
+      equiptypeList: [], //设备
       rules: {
-        name: [{ required: true, message: '必填', trigger: 'blur' }]
+        name: [{ required: true, message: "必填", trigger: "blur" }]
       }
-    }
+    };
   },
   props: {
     eid: Number,
-    parmse: String,
+    parmse: Object
   },
   created() {
     // this.getUserDepart()
@@ -97,82 +89,52 @@ export default {
     //     })
     // },
     handleSubmit() {
-      this.$refs.form.validate((v) => {
+      this.$refs.form.validate(v => {
         if (v) {
-          this.disabled = true
+          this.disabled = true;
+          // 未选是否同步到原始工艺
+
           Api.subupdate(this.entity)
-            .then((r) => {
-              this.disabled = false
+            .then(r => {
+              this.disabled = false;
               if (r.success) {
-                this.$Message.success('保存成功')
-                this.$emit('on-ok')
+                this.$Message.success("保存成功");
+                this.$emit("on-ok");
               } else {
-                this.$Message.error('保存失败')
+                this.$Message.error("保存失败");
               }
             })
-            .catch((err) => {
-              this.disabled = false
-              this.$Message.error('保存失败')
-              console.warn(err)
-            })
+            .catch(err => {
+              this.disabled = false;
+              this.$Message.error("保存失败");
+              console.warn(err);
+            });
         }
-      })
-    },
-    renderContent(h, { root, node, data }) {
-      //渲染树的样式
-      return h(
-        "span",
-        {
-          style: {
-            // color: data.isProduct != "1" ? "#249E91" : "#333", //根据选中状态设置样式
-            cursor: "pointer"
-          },
-          on: {
-            click: () => {
-              let arrTree = [];
-              arrTree.push(data);
-              this.handleSelect(arrTree); //手动选择树节点
-            }
-          }
-        },
-        data.title
-      );
+      });
     },
-    handleSelect(data) {
-      if (data.length > 0) {
-        this.selectdata = [];
-        this.selectdata = data;
-        this.list = [];
-        this.list.push({ label: data[0].title, value: data[0].id });
-        // if (data[0].isProduct == "1") {
-        //   this.orderSearchForm.productName = data[0].title;
-        //   this.orderSearchForm.productId = data[0].productId;
-        //   this.orderSearchForm.drawnNumber = data[0].drawingNo;
-        // } else {
-        //   this.$Message.error("此节点不是产品,请选择产品节点!");
-        // }
-      }
+    deprtChange(v,item){
+      console.log(v,item)
     },
     handleClose() {
-      this.$emit('on-close')
+      this.$emit("on-close");
     },
     l(key) {
-      key = 'mes_op_task_execute' + '.' + key
-      return this.$t(key)
+      key = "mes_op_task_execute" + "." + key;
+      return this.$t(key);
     }
   },
   watch: {
     eid(v) {
       if (v != 0) {
-        this.load(v)
+        this.load(v);
       }
     },
-    parmse(u){
-      console.log(u)
-      if(u){
-        this.entity = u
+    parmse(u) {
+      console.log("row数据：", u);
+      if (u) {
+        this.entity = u;
       }
     }
   }
-}
+};
 </script>

pages/aps/aps/components/excute.vue

@@ -420,20 +420,20 @@ export default {
       this.editModal = true;
       this.formData = dataForm
       // this.curId = Number(id);
-      this.getUserDepart()
+      // 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)
+        console.log("设备",res.result)
         this.$refs.editPart.equiptypeList = res.result
       })
     },