equip_type

pages/aps/ai/components/excute.vue

 <template>
-  <div style="padding: 0;" class="excute">
-    <DataGrid
-      style="margin-top:2px; margin-bottom: -5px;"
-      :columns="columns"
-      ref="grid"
-      :easy="false"
-      :high="false"
-      :set="false"
-      :border="false"
-      :data="data1"
-      :height="gridHeight"
-      :page="false"
-      :size="size"
-    ></DataGrid>
+<div style="padding: 0;" class="excute">
+    <DataGrid style="margin-top:2px; margin-bottom: -5px;" :columns="columns" ref="grid" :easy="false" :high="false" :set="false" :border="false" :data="data1" :height="gridHeight" :page="false" :size="size"></DataGrid>
     <Modal v-model="editModal" title="编辑" footer-hide width="800">
         <Edit :row="rowData" @on-close="cancel" @on-option-ok="addOk" />
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import Api from "../../aps/api";
 import Edit from "./edit";
@@ -29,7 +18,9 @@ export default {
         Add
     },
     props: {
-    rowId: { type: Number }
+        rowId: {
+            type: Number
+        }
     },
     data() {
         return {
@@ -47,8 +38,10 @@ export default {
             curId: 0,
             gridHeight: 150,
             size: "small",
-      columns: [
-        { title: " ", width: 130 },
+            columns: [{
+                    title: " ",
+                    width: 130
+                },
                 {
                     key: "task_seq",
                     title: this.l("task_seq"),
@@ -108,6 +101,13 @@ export default {
                     width: 140,
                     hide: true
                 },
+                {
+                    key: "equip_type",
+                    title: this.l("equip_type"),
+                    align: "left",
+                    easy: true,
+                    high: true
+                },
                 {
                     key: "first_equip",
                     title: this.l("first_equip"),
@@ -282,7 +282,9 @@ export default {
                     width: 140,
                     align: "center",
                     render: (h, params) => {
-            return h("div", { class: "action" }, [
+                        return h("div", {
+                            class: "action"
+                        }, [
                             h("op", {
                                 attrs: {
                                     icon: "md-create",
@@ -290,7 +292,9 @@ export default {
                                     title: "編輯工序",
                                     oprate: "edit"
                                 },
-                on: { click: () => this.edit(params.row) }
+                                on: {
+                                    click: () => this.edit(params.row)
+                                }
                             }),
                             h("op", {
                                 attrs: {
@@ -300,7 +304,9 @@ export default {
                                     oprate: "delete",
                                     msg: "确认要刪除工序吗？"
                                 },
-                on: { click: () => this.remove(params.row, params.index) }
+                                on: {
+                                    click: () => this.remove(params.row, params.index)
+                                }
                             })
                         ]);
                     }
@@ -323,7 +329,10 @@ export default {
     mounted() {
         this.loadData(this.rowId);
     },
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
         await store.dispatch("loadDictionary"); // 加载数据字典
     },
     methods: {
@@ -385,6 +394,7 @@ export default {
     }
 };
 </script>
+
 <style lang="less">
 .excute table tr th span,
 .excute table tr td {

pages/aps/aps/components/excute.vue

@@ -211,8 +211,7 @@ export default {
                     title: this.l("equip_type"),
                     align: "left",
                     easy: true,
-                    high: true,
-                    hide: true
+                    high: true
                 },
                 {
                     key: "first_equip",

pages/produce/orderSupport.vue

@@ -2,7 +2,7 @@
 @import "../processDesign/Process/menu.less";
 </style>
 <template>
-  <div class="new_box">
+<div class="new_box">
     <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="160" inline>
         <!-- <Row>
         <FormItem label="文件模板" prop="file_template">
@@ -27,13 +27,7 @@
         <Row>
             <Col span="10">
             <FormItem label="文档编号" prop="code">
-            <Input
-              size="large"
-              v-model.trim="formValidate.code"
-              placeholder="请输入..."
-              style="width:240px"
-              :disabled="codeisview"
-            />
+                <Input size="large" v-model.trim="formValidate.code" placeholder="请输入..." style="width:240px" :disabled="codeisview" />
             </FormItem>
             </Col>
             <Col span="10">
@@ -49,11 +43,7 @@
 
     <Table stripe ref="table" border :columns="column1" :data="formValidate1" class="tableCommon">
         <template slot-scope="{ row,index }" slot="materialType">
-        <state
-          code="mes_xingchi_resource.material.materialReType"
-          type="text"
-          :value="row.material_type"
-        ></state>
+            <state code="mes_xingchi_resource.material.materialReType" type="text" :value="row.material_type"></state>
         </template>
     </Table>
     <Modal v-model="newModel" title="查看物料项" :mask-closable="false" width="830px">
@@ -77,11 +67,7 @@
 
                 <Col :span="12">
                 <FormItem :label="l('materialType')" prop="materialType">
-              <Dictionary
-                :disabled="true"
-                code="mes_xingchi_resource.material.materialReType"
-                v-model="formprocessValidate.material_type"
-              ></Dictionary>
+                    <Dictionary :disabled="true" code="mes_xingchi_resource.material.materialReType" v-model="formprocessValidate.material_type"></Dictionary>
                 </FormItem>
                 </Col>
                 <Col :span="12">
@@ -117,8 +103,9 @@
             </Row>
         </Form>
     </Modal>
-  </div>
+</div>
 </template>
+
 <script>
 import service from "@/plugins/request";
 
@@ -140,9 +127,11 @@ export default {
             editindex: -1,
 
             ruleValidate: {
-        materialPlanFinishDate: [
-          { required: true, message: "配套完成时间不能为空", trigger: "blur" }
-        ]
+                materialPlanFinishDate: [{
+                    required: true,
+                    message: "配套完成时间不能为空",
+                    trigger: "blur"
+                }]
 
                 // name: [
                 //   { required: true, message: '文件名称不能为空', trigger: 'blur' }
@@ -226,8 +215,12 @@ export default {
                 procurementStandards: "",
                 qualityGrade: ""
             },
-      column1: [
-        { title: "序号", type: "index", width: "70", align: "center" },
+            column1: [{
+                    title: "序号",
+                    type: "index",
+                    width: "70",
+                    align: "center"
+                },
                 {
                     key: "materialNumber",
                     title: this.l("materialNumber"),
@@ -329,14 +322,17 @@ export default {
                         let id = params.row.id;
 
                         return h(
-              "div",
-              {
+                            "div", {
                                 class: "icon_box"
                             },
                             [
                                 h("op", {
                                     class: "view ",
-                  attrs: { icon: "ios-eye", title: "查看", type: "icon" },
+                                    attrs: {
+                                        icon: "ios-eye",
+                                        title: "查看",
+                                        type: "icon"
+                                    },
                                     on: {
                                         click: () => {
                                             this.editFun(params);
@@ -352,7 +348,7 @@ export default {
     },
 
     mounted() {},
-  created: function() {},
+    created: function () {},
     methods: {
         handleCreate1(val) {
             this.EquipList.push({
@@ -372,7 +368,7 @@ export default {
             this.newModel = true;
         },
         loaddata(orderid) {
-      var url = `${designUrl}/ordermateriallist/getbyorderid?id=` + orderid;
+            var url = `${technologyUrl}/ordermateriallist/getbyorderid?id=` + orderid;
             service.get(`${url}`).then(response => {
                 this.formValidate = response.result.orderMaterial;
 
@@ -394,7 +390,7 @@ export default {
                         orderMaterialList: this.formValidate1,
                         finishDate: this.formValidate.materialPlanFinishDate
                     };
-          let url = `${designUrl}/ordersupport/updateordermaterialactualquantity`;
+                    let url = `${technologyUrl}/ordersupport/updateordermaterialactualquantity`;
                     service.put(`${url}`, parmes).then(res => {
                         if (res.success) {
                             this.$Message.success("操作成功");