resourceSelectCode&&aps-edit

components/page/resourceSelectCode.vue

+<template>
+<Cascader :data="data" v-model="name" @on-change="change" trigger="hover"></Cascader>
+</template>
+
+<script>
+export default {
+    name: "roleSelectCode",
+    model: {
+        prop: "value",
+        event: "on-change"
+    },
+    data() {
+        return {
+            name: this.value,
+            data: [],
+            resources: [],
+            types: []
+        };
+    },
+    mounted() {
+        //
+
+        this.types = this.$store.getters.dictionaryByKey(
+            "aps.resource.type"
+        );
+        let url = `${systemUrl}/planresource/list`;
+        this.$api
+            .post(url, {
+                pageSize: 2000
+            })
+            .then(r => {
+                this.resources = r.result;
+                this.init();
+            });
+    },
+    props: {
+        value: [Array]
+    },
+    methods: {
+        init(data) {
+            var data = [];
+            this.types.map(u => {
+                let item = {
+                    label: u.name,
+                    value: parseInt(u.code)
+                };
+                var children = this.resources.filter(r => {
+                    return r.type == u.code;
+                });
+                if (children && children.length > 0) {
+                    var ul = [];
+                    children.map(u => {
+                        ul.push({
+                            label: u.title,
+                            value: u.code,
+                            id: u.id
+                        });
+                    });
+                    item.children = ul;
+                } else {
+                    item.disabled = true
+                }
+                data.push(item);
+            });
+            this.data = data;
+        },
+        change(value, selected) {
+            // console.log(event)
+            this.$emit("on-change", value, selected);
+        },
+        //获取所有的选中项
+        getSelectItems() {
+            var items = [];
+            this.value.forEach(v => {
+                var item = this.dic.filter(u => u.value == v);
+                if (item && item[0]) {
+                    items.push(item[0]);
+                }
+            });
+            return items;
+        },
+        //获取所有选中项的名称
+        getSelectNames() {
+            var names = [];
+            this.getSelectItems().forEach(v => {
+                names.push(v.label);
+            });
+            return names;
+        }
+    },
+    computed: {
+        dic() {
+            let result = [];
+            this.data.forEach(u => {
+                result.push({
+                    value: u.id,
+                    label: u.name
+                });
+            });
+            return result;
+        }
+    },
+    watch: {
+        value: {
+            handler(v, o) {
+                this.name = v;
+            },
+            deep: true
+        }
+    }
+};
+</script>

pages/aps/aps/api.js

@@ -86,7 +86,7 @@ export default {
   },
   //工时同步到原始工艺
   apsupdate(params) {
-    return Api.post(`${designUrl}/routingdetail/apsupdate `, params);
+    return Api.post(`${technologyUrl}routingdetail/apsupdate `, params);
   },
   //排序模板相关start-----
   //获取排序规则下拉列表

pages/aps/aps/components/edit.vue

 <template>
-  <Form ref="form" :model="entity" :rules="rules" :label-width="100">
+<Form ref="form" :model="entity" :rules="rules" :label-width="100">
     <Row>
         <Col :span="12">
         <FormItem :label="l('tASKSEQ')" prop="tASKSEQ">{{this.entity.task_seq}}</FormItem>
@@ -7,15 +7,19 @@
         <Col :span="12">
         <FormItem :label="l('tASKNAME')" prop="tASKNAME">{{this.entity.task_name}}</FormItem>
         </Col>
-      <Col :span="12">
+        <Col :span="12" v-if="false">
         <FormItem label="生产设备">
             <EquipSelect v-model="entity.eQUIPID"></EquipSelect>
         </FormItem>
         </Col>
-
+        <Col :span="12">
+        <FormItem label="首选资源" prop="resourceType">
+            <ResourceSelectCode v-model="entity.resource" @on-change="resourceChange"></ResourceSelectCode>
+        </FormItem>
+        </Col>
         <Col :span="12" v-model="entity.rUNTIME">
         <FormItem :label="l('rUNTIME')" prop="rUNTIME">
-          <InputTime v-model="entity.run_time" ></InputTime>
+            <InputTime v-model="entity.run_time"></InputTime>
         </FormItem>
         </Col>
         <Col :span="12">
@@ -28,8 +32,9 @@
         <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
         <Button @click="handleClose" class="ml20">取消</Button>
     </FormItem>
-  </Form>
+</Form>
 </template>
+
 <script>
 import Api from "../api";
 export default {
@@ -39,8 +44,18 @@ export default {
 
             entity: {},
             orderCatList: [],
+            resources: [],
             rules: {
-        name: [{ required: true, message: "必填", trigger: "blur" }]
+                name: [{
+                    required: true,
+                    message: "必填",
+                    trigger: "blur"
+                }],
+                resourceType: [{
+                    required: true,
+                    message: "请选择首选资源",
+                    trigger: "change",
+                }, ],
             },
             single: false
         };
@@ -56,6 +71,7 @@ export default {
     methods: {
         load(v) {
             this.entity = v;
+
         },
         handleSubmit() {
             this.$refs.form.validate(v => {
@@ -63,7 +79,7 @@ export default {
 
                     let parmsUp = {
                         run_time: this.entity.run_time,
-            first_equip: this.entity.eQUIPID,
+                        first_equip: this.entity.resourceCode,
                         id: this.entity.id
                     };
                     Api.updatesetuptimeandfirstequip(parmsUp)
@@ -77,7 +93,7 @@ export default {
                                         id: this.entity.routing_detail_id, //工序ID
                                         name: this.entity.task_name, //工序名
                                         task_seq: this.entity.task_seq, //工序号
-                    resource_id: this.entity.eQUIPID, //设备id
+                                        resource_id: this.entity.resourceId, //设备id
                                         runtime: this.entity.run_time, //单件工时
                                         department_id: 0 //班组ID
                                     };
@@ -112,6 +128,18 @@ export default {
         handleClose() {
             this.$emit("on-close");
         },
+        resourceChange(v, items) {
+            //alert(v.length)
+            //alert(JSON.stringify(v))
+            //alert(JSON.stringify(items))
+            this.entity.resourceCode = v[1];
+            this.entity.resourceId = items[1].id;
+            if (v != null && v.length > 0) {
+                this.rules.resourceType[0].required = false;
+            } else {
+                this.rules.resourceType[0].required = true;
+            }
+        },
         l(key) {
             key = "mes_op_task_execute" + "." + key;
             return this.$t(key);
@@ -120,8 +148,27 @@ export default {
     watch: {
         row(v) {
             if (v != {}) {
-        //alert(JSON.stringify(v))
+                let url = `${systemUrl}/planresource/list`;
+                this.$api
+                    .post(url, {
+                        pageSize: 2000
+                    })
+                    .then(r => {
+                        this.resources = this.$u.clone(r.result);
                         this.entity = v;
+                        let code = v.code;
+                        //let code = 'PCZYBZBH_20200804_1'
+                        if (code && code != '') {
+                            this.resources.forEach(e => {
+                                if (e.code == code) {
+                                    this.entity.resource = []
+                                    this.entity.resource.push(parseInt(e.type));
+                                    this.entity.resource.push(code)
+                                }
+                            })
+                        }
+                    });
+
             }
         }
     }

plugins/iview.js

@@ -37,6 +37,7 @@ import WorkShop from '@/components/page/workShop.vue'
 import EquipSelect from '@/components/page/equipSelect.vue'
 import EquipTypeSelect from '@/components/page/equipTypeSelect.vue'
 import ResourceSelect from '@/components/page/resourceSelect.vue'
+import ResourceSelectCode from '@/components/page/resourceSelectCode.vue'
 import StoreTree from '@/components/page/storeTree.vue'
 import StoreSelect from '@/components/page/storeSelect.vue'
 import clipboard from 'clipboard';
@@ -124,6 +125,7 @@ Vue.component("WorkShop", WorkShop)
 Vue.component("EquipSelect", EquipSelect)
 Vue.component("EquipTypeSelect", EquipTypeSelect)
 Vue.component("ResourceSelect", ResourceSelect)
+Vue.component("ResourceSelectCode", ResourceSelectCode)
 Vue.component("User", User)
 Vue.component("op", op) //DepartmentSelect
 Vue.component("DepartmentSelect", DepartmentSelect)