申请配套

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

@@ -47,4 +47,8 @@ export default {
     supportmainCreate(params){////保存配套
         return Api.post(`${technologyUrl}supportmain/create`, params);
     },
+    groupitemlist(params){//申请单列表
+        return Api.post(`${technologyUrl}supportmain/groupitemlist`, 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) {
+        let msg=""
+        if(type==0)
+        {
+           msg="行内数据"
+        }
+        else
+        {
+             msg="整个申请单数据"
+        }
+      alert(msg+"_____"+JSON.stringify(arr));
+    },
+  },
+  watch: {
+    eid(v) {
+      if (v != 0) {
+        this.load(v);
+      }
+    },
+  },
+};
+</script>

pages/aps/plan/index.vue

@@ -127,7 +127,7 @@
     </Modal>
     <Modal v-model="modalAccessory" :title="title" fullscreen footer-hide>
       <component
-        :is="detail"
+        :is="details"
         :eid="orderId"
         :mesCode="mesCode"
         :productName="productName"
@@ -179,11 +179,11 @@ export default {
       name: "",
       item: null,
       title: "",
-      detail: null,
+      details: null,
       uId: "",
       hid: 0,
       orderId: 0,
-      mesCode:"",
+      mesCode: "",
       productName: "",
       drawnNumber: "",
       count: 0,
@@ -805,12 +805,18 @@ export default {
     },
     openAccessory(row) {
       this.orderId = row.id;
-      this.mesCode=row.mesCode;
+      this.mesCode = row.mesCode;
       this.productName = row.productName;
       this.drawnNumber = row.drawnNumber;
       this.count = row.quantity;
-      this.title = "申请配套";
-      this.detail = () => import("./addAccessory");
+      if (row.isSupportingFinish == 0) {
+        this.title = "申请配套";
+        this.details = () => import("./addAccessory");
+      } else {
+        this.title = "申请单";
+        this.details = () => import("./detailAccessory");
+      }
+
       this.modalAccessory = true;
     },
     cancel() {

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;
 }