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

i18n/locale/zh-CN.js

@@ -1108,6 +1108,7 @@ export default {
     efficiency_value: '效率系数',
     singleout: '单件产出',
     first_equip: '首选资源',
+    firsT_EQUIP_CODE: '首选资源编号',
     equip_type: '设备类型',
     cal_id: '连班策略',
     machine_rule: '设备优先规则',

pages/aps/aps/components/excute.vue

@@ -144,8 +144,9 @@ export default {
                     key: "firsT_EQUIP_CODE",
                     title: this.l("first_equip"),
                     align: "left",
-                    easy: true,
-                    high: true
+                    render: (h, params) => { //test:PCZYBZBH_20200804_1  params.row.firsT_EQUIP_CODE
+                        return h("span", {}, this.getResourceName(params.row.firsT_EQUIP_CODE))
+                    }
                 },
                 {
                     key: "setup_time",
@@ -366,7 +367,9 @@ export default {
                 count: 0 //生产计划数量
             },
             //设置参数结束
-            rowData: {} //编辑时传入行数据
+            rowData: {}, //编辑时传入行数据
+            resources: [],
+            types: [],
         };
     },
     mounted() {
@@ -378,6 +381,10 @@ export default {
     }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
     },
+    created() {
+        this.types = this.$store.getters.dictionaryByKey("aps.resource.type");
+        this.getResource();
+    },
     methods: {
         //根据点击副组件传过来id进行加载数据
         loadData(expendId) {
@@ -499,6 +506,36 @@ export default {
             this.deletedlModal = false;
             this.insertlModal = false;
         },
+        //根据firsT_EQUIP_CODE返回对应的首选资源
+        getResourceName(code) {
+            let name = ""
+            let resources = this.$u.clone(this.resources);
+            if (code && code != '') {
+                resources.forEach(e => {
+                    if (e.code == code) {
+                        let type = e.type
+                        this.types.forEach(el => {
+                            if (type && type != '' && el.code == e.type) {
+                                name = el.name + "/" + e.title
+                            }
+                        })
+                    }
+                })
+            }
+            return name;
+        },
+        //获取首选资源所有的数据
+        getResource() {
+            let url = `${systemUrl}/planresource/list`;
+            let name = ""
+            this.$api
+                .post(url, {
+                    pageSize: 2000
+                })
+                .then(r => {
+                    this.resources = r.result;
+                });
+        },
         l(key) {
             let vkey = "mes_op_task_plan_simulate" + "." + key;
             return this.$t(vkey) || key;

pages/technology/index.vue

@@ -514,7 +514,7 @@ export default {
             this.$http.order.batchstart(this.dataListRetrun).then(res => {
                 if (res.success) {
                     this.$Message.success("工艺规程送审成功!");
-                    this.loaddata();
+                    this.search();
                     //this.easySearch('')
                 } else {
                     this.$Message.error("工艺规程送审失败!");