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

i18n/locale/zh-CN.js

@@ -1570,6 +1570,10 @@ export default {
     originalManufacturer: '原厂家',
     remark: '备注',
     materialCode: '物料编码',
+    creationTime1: '入库时间',
+    creator1: '入库人',
+    total1: '库存',
+    count:'出库数'
   },
   stock_item: {
     creationTime: '创建时间',
@@ -1599,7 +1603,7 @@ export default {
     nowTotal: '剩余数量',
   },
   support_main: {
-    creationTime: '创建时间',
+    creationTime: '申请日期',
     creatorUserId: '创建人',
     lastModificationTime: '更新时间',
     lastModifierUserId: '更新人',
@@ -1611,14 +1615,20 @@ export default {
     drawnNumber: '图号',
     count: '订单数量',
     creator: '申请人',
-    status: '状态',
+    status: '配套状态',
+    status1: '出库状态',
     finishDate: '齐套时间',
     orderCode: '订单编号',
     code: '申请单号',
+    materialName:'物料名称',
+    materialNumber:'物料编号',
+    remark:'备注',
+    count1: '申请数量',
+    outCount:'出库数',
   },
   support_item:{
-    creationTime:'创建时间',
-    creatorUserId:'创建人',
+    creationTime:'出库时间',
+    creatorUserId:'出库人',
     lastModificationTime:'更新时间',
     lastModifierUserId:'更新人',
     isDeleted:'删除人',
@@ -1630,7 +1640,7 @@ export default {
     routingDetailName:'工序',
     routingDetailSeq:'工序号',
     routingDetailNo:'工序号',
-    count:'申请数量',
+    count:'出库数',
     status:'状态',
     materialId:'物料id',
     materialName:'物料名称',
@@ -1641,5 +1651,7 @@ export default {
     outStockNumber:'出库数量',
     orderId:'',
     remark:'备注',
+    storeId: '库位id',
+    storeTitle: '库位名称',
          }
 }

pages/aps/plan/addAccessory.vue

@@ -294,6 +294,7 @@ export default {
           let parms = {
             main: {
               orderId: this.orderId,
+              orderCode:this.mesCode,
               productName: this.productNames,
               drawnNumber: this.drawnNumbers,
               count: this.counts,

pages/aps/plan/editAccessory.vue

@@ -420,6 +420,7 @@ export default {
               count: this.counts,
               creator: this.$store.state.userInfo.userName,
               finishDate: this.orderForm.QuotationFinishDate,
+              orderCode:this.mesCode,
             },
             items: temItems,
           };
@@ -463,6 +464,7 @@ export default {
               count: this.counts,
               creator: this.$store.state.userInfo.userName,
               finishDate: this.entity.finishDate,
+              orderCode:this.mesCode,
             },
             items: temItems,
           };

pages/aps/results/gantt.vue

@@ -327,24 +327,24 @@ let options = {
         id: 8,
         label: "派工数量",
         value: "dispatch_qty",
-        width: 68,
-      },
-      {
-        id: 9,
-        label: "%",
-        value: "progress",
-        width: 35,
-        style: {
-          "task-list-header-label": {
-            "text-align": "center",
-            width: "100%",
-          },
-          "task-list-item-value-container": {
-            "text-align": "center",
-            width: "100%",
-          },
-        },
+        width: 100,
       },
+      // {
+      //   id: 9,
+      //   label: "%",
+      //   value: "progress",
+      //   width: 35,
+      //   style: {
+      //     "task-list-header-label": {
+      //       "text-align": "center",
+      //       width: "100%",
+      //     },
+      //     "task-list-item-value-container": {
+      //       "text-align": "center",
+      //       width: "100%",
+      //     },
+      //   },
+      // },
     ],
   },
   locale: {

pages/aps/supprotMain/api.js

+import Api from '@/plugins/request'
+export default {
+  index: `${technologyUrl}supportmain/paged`,
+  paged(params) {
+    return Api.post(`${technologyUrl}supportmain/paged`, params);
+  },
+  get(params) {
+    return Api.get(`${technologyUrl}supportmain/get`, params);
+  },
+  create(params) {
+    return Api.post(`${technologyUrl}supportmain/create`, params);
+  },
+  update(params) {
+    return Api.post(`${technologyUrl}supportmain/update`, params);
+  },
+  delete(id) {
+    return Api.delete(`${technologyUrl}supportmain/delete`, {
+      params: {
+        id: id
+      }
+    });
+  },
+  deletes(params) {
+    return Api.post(`${technologyUrl}supportmain/batchdelete`, params);
+  },
+  getitemlist(params) {//根据id获取单个配套
+    return Api.get(`${technologyUrl}supportmain/getitemlist`, params);
+  },
+  supportmateriallist(params) {//查询所有物料对应的库房信息
+    return Api.post(`${resourceUrl}/stock/supportmateriallist`, params);
+  },
+  supportmateriallistone(params) {//点击物料根据物料ID获取对应的库房信息
+    return Api.post(`${resourceUrl}/stock/supportmateriallistone`, params);
+  },
+  outmainCreate(params) {//批量出库
+    return Api.post(`${resourceUrl}/outmain/create`, params);
+  },
+  outmainBatchdel(params) {//批量撤销出库
+    return Api.post(`${resourceUrl}/outmain/batchdelete`, params);
+  },
+  indexAcc: `${resourceUrl}/outitem/paged`,
+}

pages/aps/supprotMain/index.vue

+<template>
+  <div class="h100">
+    <DataGrid :columns="columns" ref="grid" :action="action">
+      <template slot="easySearch">
+        <Form ref="formInline" :model="easySearch" inline>
+          <FormItem prop="keys">
+            <Input placeholder="请输入申请单号或订单编号" v-model="easySearch.keys.value" v-width="240" />
+          </FormItem>
+          <FormItem>
+            <Button type="primary" @click="search">查询</Button>
+          </FormItem>
+        </Form>
+      </template>
+    </DataGrid>
+    <Modal v-model="modal" :title="title" width="1200" fullscreen footer-hide>
+      <component :is="detail" :eid="curId" :row="entity" @on-close="cancel" @on-ok="ok" />
+    </Modal>
+  </div>
+</template>
+<script>
+import Api from "./api";
+export default {
+  name: "list",
+  components: {},
+  head: {
+    title: "配套记录主表",
+    author: "henq",
+    description: "support_main  8/8/2020 9:47:54 AM",
+  },
+  data() {
+    return {
+      action: Api.index,
+      easySearch: {
+        keys: { op: "orderCode,code", value: null },
+      },
+      statuList: this.$store.getters.dictionaryByKey("accessory.status") || [],
+      statuList1: this.$store.getters.dictionaryByKey("outstore.status") || [],
+      modal: false,
+      title: "新增",
+      detail: null,
+      curId: 0,
+      entity: {},
+      columns: [
+        {
+          key: "code",
+          title: this.l("code"),
+          align: "left",
+          easy: true,
+        },
+        {
+          key: "finishDate",
+          title: this.l("finishDate"),
+          align: "center",
+          type: "date",
+        },
+        {
+          key: "orderCode",
+          title: this.l("orderCode"),
+          align: "left",
+          easy: true,
+        },
+        {
+          key: "creationTime",
+          title: this.l("creationTime"),
+          align: "center",
+          type: "date",
+        },
+        { key: "creator", title: this.l("creator"), align: "left" },
+        { key: "status", title: this.l("status"), align: "center" },
+        { key: "status1", title: this.l("status1"), align: "center" },
+        {
+          title: "操作",
+          key: "action",
+          width: 140,
+          align: "center",
+          render: (h, params) => {
+            return h("div", { class: "action" }, [
+              h(
+                "op",
+                {
+                  attrs: { oprate: "detail" },
+                  on: { click: () => this.getAccessory(params.row) },
+                },
+                "配套"
+              ),
+              h(
+                "op",
+                {
+                  attrs: { oprate: "edit" },
+                  on: { click: () => this.getOutBound(params.row) },
+                },
+                "出库单"
+              ),
+            ]);
+          },
+        },
+      ],
+    };
+  },
+  mounted() {
+    this.search();
+  },
+  async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
+  },
+  methods: {
+    ok() {
+      this.$refs.grid.load();
+      this.modal = false;
+      this.curId = 0;
+    },
+    search() {
+      this.$refs.grid.reload(this.easySearch);
+    },
+
+    getAccessory(row) {
+      this.curId = row.id;
+      this.title = "配套";
+      this.entity = row;
+      this.detail = () => import("./accessory");
+      this.modal = true;
+    },
+    getOutBound(row) {
+      this.curId = row.id;
+      this.title = "出库单";
+      this.detail = () => import("./outbound");
+      this.modal = true;
+    },
+    //配套申请
+    setName(list, v) {
+      let outPar = {
+        name: "",
+        color: "",
+      };
+      if ((v + "").indexOf(",") == -1) {
+        var item;
+        list.map((u) => {
+          if (u.code == v) {
+            item = u;
+          }
+        });
+        if (item) {
+          //this.items = item;
+          outPar = {
+            name: item.name,
+            color: item.color,
+          };
+        }
+      }
+      return outPar;
+    },
+    cancel() {
+      this.curId = 0;
+      this.modal = false;
+    },
+    l(key) {
+      let vkey = "support_main" + "." + key;
+      return this.$t(vkey) || key;
+    },
+  },
+};
+</script>
+<style lang="less">
+</style>
\ No newline at end of file

pages/aps/supprotMain/outbound.vue

+<template>
+    <div>444444</div>
+</template>
\ No newline at end of file

pages/order/monitoring/speed.vue

@@ -309,7 +309,7 @@ export default {
   methods: {
     split(row, index) {
       //工单分卡
-      this.getProduct(row.id);
+      this.getProduct(row);
       this.initeId = {
         routingDetailId: row.detailId,
         dispatchId: row.id
@@ -322,9 +322,13 @@ export default {
         this.entity.scheduleType = null;
       }
     },
-    getProduct(id) {
+    getProduct(row) {
       let params = {
-        entryID: id
+        dispatch_id:row.id,
+        execute_id:row.executeId,
+        order_id:row.orderId,
+        RoutingHeaderId:row.routingHeaderId,
+        RoutingDetailId:row.detailId,
       };
       Api.getentryproductcode(params).then(res => {
         if (res.success) {

pages/produce/orderlist.vue

@@ -69,6 +69,7 @@
                   height="120"
                   :title="row.productUrl"
                   style="border:#cacbd0 dashed 1px"
+                  onerror="this.src='/imgicon/noPic_product.png';"
                 />
               </Col>
               <Col span="16" class="row">