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

assets/css/base.less

@@ -314,7 +314,15 @@ div::-webkit-scrollbar-corner {
 .pt10 {
   padding: 10px 0px 0;
 }
-
+.pb5 {
+  padding-bottom: 5px;
+}
+.pb10 {
+  padding-bottom: 10px;
+}
+.pb20 {
+  padding-bottom: 20px;
+}
 .ptb5 {
   padding-top: 5px;
   padding-bottom: 5px;
@@ -324,6 +332,7 @@ div::-webkit-scrollbar-corner {
   padding: 10px;
 }
 
+
 .p10 {
   padding: 10px;
 }
@@ -335,6 +344,12 @@ div::-webkit-scrollbar-corner {
 .pl30 {
   padding-left: 30px
 }
+.pl40 {
+  padding-left: 40px
+}
+.pl50 {
+  padding-left: 50px
+}
 
 .pl5 {
   padding-left: 5px

pages/aps/plan/api.js

@@ -36,5 +36,22 @@ export default {
     },
     moveintoai(){////跳转进入智能排产池前判断
         return Api.post(`${PlanUrl}/messchedule/moveintoai`);
-    }
+    },
+    //配套相关
+    matchlist(params){//申请配套列表
+        return  Api.get(`${technologyUrl}materiallist/matchlist`, params);
+    },
+    supportmainPaged(params){////配套记录
+        return Api.post(`${technologyUrl}supportmain/paged`, params);
+    },
+    supportmainCreate(params){////保存配套
+        return Api.post(`${technologyUrl}supportmain/create`, params);
+    },
+    groupitemlist(params){//申请单列表
+        return Api.post(`${technologyUrl}supportmain/groupitemlist`, params);
+    },
+    batchdelete(params){//批量撤回
+        return Api.post(`${technologyUrl}supportitem/batchdelete`, params);
+    },
+   
 }
\ No newline at end of file

pages/aps/plan/detailAccessory.vue

+
+<template>
+  <div class="h100 table-content">
+    <p class="mb10">
+      订单编号：{{mesCodes}}
+      <span class="ml20">产品名称：{{productNames}}</span>
+      <span class="ml20">生产数量：{{counts}}</span>
+    </p>
+    <Layout>
+      <Content>
+        <div class="mb20" v-for="(item,index) in datas" :key="index">
+          <p class="fwBold" :id="'item'+index">
+            齐套日期：{{item.finishDate}}
+            <span class="ml20">申请人：{{item.creator}}</span>
+            <span class="ml20">申请时间：{{item.applyTime}}</span>
+          </p>
+          <Table border :columns="cols" :data="item.children" class="tableCommon"></Table>
+          <Button type="primary" class="mt10" @click="application(1,item.children)" size="large">撤回</Button>
+        </div>
+      </Content>
+      <Sider hide-trigger style="background:#fff;color:black;" width="300">
+        <Collapse value="1" class="mt20" style="position:fixed;width:260px">
+          <Panel name="1">
+            申请记录
+            <div slot="content" class="pl30 pb10 lh25">
+              <p v-for="(items,i) in datas" :key="i">
+                <a :href="'#item'+i">
+                  <span>{{items.applyTime.substring(0,10)}}</span>
+                  <span class="fr mr10">{{items.creator}}</span>
+                </a>
+              </p>
+            </div>
+          </Panel>
+        </Collapse>
+      </Sider>
+    </Layout>
+  </div>
+</template>
+<script>
+import Api from "./api";
+export default {
+  name: "detailAccessory",
+  data() {
+    return {
+      disabled: false,
+      deletelModal: false,
+      curId: 0,
+      editIndex: -1,
+      editNum: "",
+      cols: [
+        {
+          key: "materialName",
+          title: "物料名",
+          align: "left",
+        },
+        {
+          key: "materialNumber",
+          title: "物料编号",
+          align: "left",
+        },
+        {
+          key: "needCount",
+          title: "需求数量",
+          align: "right",
+        },
+        {
+          key: "count",
+          title: "申请数量",
+          align: "right",
+          width: 120,
+        },
+        {
+          key: "counts",
+          title: "状态",
+          align: "center",
+          width: 120,
+        },
+        {
+          key: "remark",
+          title: "备注",
+          align: "left",
+        },
+        {
+          key: "action",
+          title: "状态",
+          width: 120,
+          align: "center",
+          render: (h, params) => {
+            return h("div", { class: "action" }, [
+              h(
+                "op",
+                {
+                  attrs: {
+                    oprate: "detail",
+                  },
+                  on: {
+                    click: () => this.application(0, params.row),
+                  },
+                },
+                "撤回"
+              ),
+            ]);
+          },
+        },
+      ],
+
+      datas: [],
+      selectItems: [],
+      footerToolbar: false,
+      orderId: this.eid,
+      mesCodes: this.mesCode,
+      productNames: this.productName,
+      drawnNumbers: this.drawnNumber,
+      counts: this.count,
+    };
+  },
+  props: {
+    eid: Number,
+    mesCode: String,
+    productName: String,
+    drawnNumber: String,
+    count: Number,
+  },
+  mounted() {
+    this.load(this.eid);
+  },
+  async fetch({ store, params }) {
+    await store.dispatch("loadDictionary"); // 加载数据字典
+  },
+  methods: {
+    load(v) {
+      Api.groupitemlist({ id: v }).then((r) => {
+        if (r.success) {
+          this.datas = r.result;
+        }
+      });
+    },
+    application(type, arr) {//撤回配套申请 type:0 单条 1 全部
+      let parms = [];
+      if (type == 0) {
+        parms.push(arr.id);
+      } else {
+        arr.forEach((ele) => {
+          parms.push(ele.id);
+        });
+      }
+      Api.batchdelete(parms).then(res=>{
+        if(res.success&&res.result)
+        {
+          this.$Message.success("撤销成功");
+          this.$emit('on-ok')
+        }
+      })
+    },
+  },
+  watch: {
+    eid(v) {
+      if (v != 0) {
+        this.load(v);
+      }
+    },
+  },
+};
+</script>

pages/aps/plan/index.vue

@@ -98,16 +98,16 @@
       -->
       <RadioGroup v-model="scheduleType" class="radioList" @on-change="onchangeScheduleType">
         <Radio :label="1" border :disabled="this.$store.state.countAi>0">
-          <span >Aps排产</span>
+          <span>Aps排产</span>
         </Radio>
         <Radio :label="4" border :disabled="this.$store.state.countAps>0">
-          <span >智能排产</span>
+          <span>智能排产</span>
         </Radio>
         <Radio :label="2" border>
-          <span >整机排产</span>
+          <span>整机排产</span>
         </Radio>
         <Radio :label="3" border>
-          <span >流水排产</span>
+          <span>流水排产</span>
         </Radio>
       </RadioGroup>
       <p class="pl30 pt10" v-show="scheduleType!=null">
@@ -125,6 +125,18 @@
     <Modal v-model="orderSupportModal" title="配套下发" footer-hide width="1300">
       <orderSupport ref="orderSupport"></orderSupport>
     </Modal>
+    <Modal v-model="modalAccessory" :title="title" fullscreen footer-hide>
+      <component
+        :is="details"
+        :eid="orderId"
+        :mesCode="mesCode"
+        :productName="productName"
+        :drawnNumber="drawnNumber"
+        :count="count"
+        @on-close="cancel"
+        @on-ok="addOk"
+      />
+    </Modal>
   </div>
 </template>
 <script>
@@ -162,6 +174,20 @@ export default {
       scheduleModal: false,
       orderSupportModal: false,
       curId: 0,
+      statuList:
+        this.$store.getters.dictionaryByKey("aps.plan.supportingStatus") || [],
+      name: "",
+      items: null,
+      title: "",
+      details: null,
+      uId: "",
+      hid: 0,
+      orderId: 0,
+      mesCode: "",
+      productName: "",
+      drawnNumber: "",
+      count: 0,
+      modalAccessory: false,
       columns: [
         {
           key: "selection",
@@ -203,8 +229,23 @@ export default {
           key: "isSupportingFinish",
           title: this.l("isSupportingFinish"),
           align: "center",
-          high: true,
-          code: "aps.plan.supportingStatus",
+          render: (h, params) => {
+            return h(
+              "op",
+              {
+                attrs: {
+                  oprate: "detail",
+                },
+                style: {
+                  color: this.setName(params.row.isSupportingFinish).color,
+                },
+                on: {
+                  click: () => this.openAccessory(params.row),
+                },
+              },
+              this.setName(params.row.isSupportingFinish).name
+            );
+          },
         },
         {
           key: "projectNumber",
@@ -611,6 +652,7 @@ export default {
       this.listBatchIds = [];
       this.listBatchIds1 = [];
       this.canselFooter();
+      this.modalAccessory = false;
     },
     search() {
       this.$refs.grid.reload(this.easySearch);
@@ -623,7 +665,6 @@ export default {
       this.editModal = true;
       this.curId = id;
     },
-
     remove(id) {
       this.deletelModal = true;
       this.curId = id;
@@ -649,6 +690,7 @@ export default {
       //aps
       this.dispatchModal = false;
       this.scheduleModal = false;
+      this.modalAccessory = false;
       // this.listBatchIds = []
       // this.listBatchIds1 = []
       // this.canselFooter()
@@ -742,6 +784,49 @@ export default {
           this.$Message.error("获取排产模型数量失败");
         });
     },
+    //配套申请
+    setName(v) {
+      let outPar = {
+        name: "",
+        color: "",
+      };
+      if ((v + "").indexOf(",") == -1) {
+        var item;
+        this.statuList.map((u) => {
+          if (u.code == v) {
+            item = u;
+          }
+        });
+        if (item) {
+          //this.items = item;
+          outPar = {
+            name: item.name,
+            color: item.color,
+          };
+        } 
+      }
+      return outPar;
+    },
+    openAccessory(row) {
+      this.orderId = row.id;
+      this.mesCode = row.mesCode;
+      this.productName = row.productName;
+      this.drawnNumber = row.drawnNumber;
+      this.count = row.quantity;
+      if (row.isSupportingFinish == 0) {
+        this.title = "申请配套";
+        this.details = () => import("./addAccessory");
+      } else {
+        this.title = "申请单";
+        this.details = () => import("./detailAccessory");
+      }
+
+      this.modalAccessory = true;
+    },
+    ok() {
+      this.modalAccessory = false;
+      this.curId = 0;
+    },
   },
 };
 </script>

src/assets/css/base.css

@@ -242,6 +242,15 @@ div::-webkit-scrollbar-corner {
 .pt10 {
   padding: 10px 0px 0;
 }
+.pb5 {
+  padding-bottom: 5px;
+}
+.pb10 {
+  padding-bottom: 10px;
+}
+.pb20 {
+  padding-bottom: 20px;
+}
 .ptb5 {
   padding-top: 5px;
   padding-bottom: 5px;
@@ -258,6 +267,12 @@ div::-webkit-scrollbar-corner {
 .pl30 {
   padding-left: 30px;
 }
+.pl40 {
+  padding-left: 40px;
+}
+.pl50 {
+  padding-left: 50px;
+}
 .pl5 {
   padding-left: 5px;
 }