出库单span css zh api......

assets/css/base.less

@@ -233,6 +233,12 @@ div::-webkit-scrollbar-corner {
 .mb50 {
   margin-bottom: 50px;
 }
+.mb60 {
+  margin-bottom: 60px;
+}
+.mb70 {
+  margin-bottom: 70px;
+}
 
 .ml0 {
   margin-left: 0;

i18n/locale/zh-CN.js

@@ -1573,9 +1573,9 @@ export default {
     creationTime1: '入库时间',
     creator1: '入库人',
     total1: '库存',
-    count:'出库数',
-    code:'物料序号',
-    nowTotal:'库存'
+    count: '出库数',
+    code: '物料序号',
+    nowTotal: '库存'
   },
   stock_item: {
     creationTime: '创建时间',
@@ -1622,38 +1622,39 @@ export default {
     finishDate: '齐套时间',
     orderCode: '订单编号',
     code: '申请单号',
-    materialName:'物料名称',
-    materialNumber:'物料编号',
-    remark:'备注',
+    materialName: '物料名称',
+    materialNumber: '物料编号',
+    remark: '备注',
     count1: '申请数量',
-    outCount:'出库数',
-  },
-  support_item:{
-    creationTime:'出库时间',
-    creatorUserId:'出库人',
-    lastModificationTime:'更新时间',
-    lastModifierUserId:'更新人',
-    isDeleted:'删除人',
-    deletionTime:'删除时间',
-    deleterUserId:'删除人',
-    supportMainId:'主表id',
-    routingHeaderId:'工艺id',
-    routingDeatilId:'工序id',
-    routingDetailName:'工序',
-    routingDetailSeq:'工序号',
-    routingDetailNo:'工序号',
-    count:'出库数',
-    status:'状态',
-    materialId:'物料id',
-    materialName:'物料名称',
-    nameMaterial:'物料名称',
-    materialNumber:'物料编号',
-    needCount:'需要数量',
-    totalCount:'需要数量',
-    outStockNumber:'出库数量',
-    orderId:'',
-    remark:'备注',
+    outCount: '出库数',
+  },
+  support_item: {
+    creationTime: '出库时间',
+    creatorUserId: '出库人',
+    lastModificationTime: '更新时间',
+    lastModifierUserId: '更新人',
+    isDeleted: '删除人',
+    deletionTime: '删除时间',
+    deleterUserId: '删除人',
+    supportMainId: '主表id',
+    routingHeaderId: '工艺id',
+    routingDeatilId: '工序id',
+    routingDetailName: '工序',
+    routingDetailSeq: '工序号',
+    routingDetailNo: '工序号',
+    count: '出库数',
+    status: '状态',
+    materialId: '物料id',
+    materialName: '物料名称',
+    nameMaterial: '物料名称',
+    materialNumber: '物料编号',
+    needCount: '需要数量',
+    totalCount: '需要数量',
+    outStockNumber: '出库数量',
+    orderId: '',
+    remark: '备注',
     storeId: '库位id',
     storeTitle: '库位名称',
+    stockCode: '物料序号'
   }
 }

pages/aps/supprotMain/accessory.vue

@@ -12,6 +12,8 @@
     </p>
     <Split v-model="split" mode="vertical" @on-move-end="moveEnd">
       <div slot="top" class="demo-split-pane" style="background:#fff;height:100%">
+        <Card :padding="0">
+          <p slot="title">申请单物料列表</p>
           <Table
             :columns="cols"
             :data="datas"
@@ -21,11 +23,16 @@
             @on-current-change="curChange"
             :height="tableHeight1"
           ></Table>
+        </Card>
       </div>
       <div slot="bottom" class="demo-split-pane" style="background:#fff;height:100%">
-        <p class="mt10 mb10" v-show="showBottom">
-          <Button type="primary" @click="getMetaiAll">出库</Button>
-        </p>
+        <Card :padding="0" v-show="showBottom">
+          <p slot="title">出库物料库房库位列表</p>
+          <div slot="extra">
+            <Button type="primary" @click="getMetaiAll" shape="circle" >出库
+           <Icon type="md-arrow-dropright" />
+            </Button>
+          </div>
           <Table
             :columns="colsOut"
             :data="datasOut"
@@ -33,7 +40,6 @@
             border
             highlight-row
             :height="tableHeight2-40"
-          v-show="showBottom"
           >
             <template slot-scope="{ row, index }" slot="counts">
               <InputNumber
@@ -44,9 +50,10 @@
               />
             </template>
           </Table>
+        </Card>
       </div>
     </Split>
-    <Modal v-model="ModalAccList" title="出库记录" width="1000" footer-hide>
+    <Modal v-model="ModalAccList" title="出库记录" width="1180" footer-hide>
       <DataGrid
         :action="action"
         :columns="colsList"
@@ -92,20 +99,23 @@ export default {
           key: "count",
           title: this.l("count1"),
           align: "right",
-          width:150,
+          width: 150,
         },
         {
           key: "outCount",
           title: "出库数",
           align: "right",
-          width:150,
+          width: 150,
           render: (h, params) => {
             return h(
               "op",
               {
                 attrs: {
                   oprate: "detail",
-                  title: params.row.outCount&&params.row.outCount>0?"出库明细":"",
+                  title:
+                    params.row.outCount && params.row.outCount > 0
+                      ? "出库明细"
+                      : "",
                 },
                 style: {
                   color: "blue",
@@ -122,14 +132,11 @@ export default {
           key: "status",
           title: "状态",
           align: "center",
-          width:150,
+          width: 150,
           render: (h, params) => {
             return h(
-              "op",
+              "span",
               {
-                attrs: {
-                  oprate: "detail",
-                },
                 style: {
                   color: this.setName(this.statuList1, params.row.status).color,
                 },
@@ -178,7 +185,7 @@ export default {
           key: "creationTime",
           title: this.l1("creationTime1"),
           align: "center",
-          width:220,
+          width: 220,
         },
         {
           key: "creator",
@@ -189,14 +196,14 @@ export default {
           key: "nowTotal",
           title: this.l1("nowTotal"),
           align: "right",
-          width:150,
+          width: 150,
         },
         {
           key: "count",
           title: this.l1("count"),
           align: "right",
           slot: "counts",
-          width:150,
+          width: 150,
         },
       ],
       datasOut: [],
@@ -208,6 +215,11 @@ export default {
           title: this.l2("materialName"),
           align: "left",
         },
+        {
+          key: "stockCode",
+          title: this.l2("stockCode"),
+          align: "left",
+        },
         {
           key: "materialNumber",
           title: this.l2("materialNumber"),
@@ -223,7 +235,7 @@ export default {
           key: "creationTime",
           title: this.l2("creationTime"),
           align: "center",
-          width:220,
+          width: 220,
         },
         {
           key: "creatorUserId",
@@ -234,7 +246,7 @@ export default {
           key: "count",
           title: this.l2("count"),
           align: "right",
-          width:150,
+          width: 100,
         },
       ],
     };
@@ -244,7 +256,7 @@ export default {
     row: Object,
   },
   mounted() {
-    this.splitHeight = window.innerHeight - 150;
+    this.splitHeight = window.innerHeight - 260;
     this.tableHeight1 = this.splitHeight * this.split;
     this.tableHeight2 = this.splitHeight * (1 - this.split);
     window.onresize = () => {
@@ -350,7 +362,7 @@ export default {
       temItems.forEach((el) => {
         if (el.count > 0) {
           let temObj = {
-            stockItemId:el.id,
+            stockItemId: el.id,
             count: el.count,
             storeId: el.storeId,
             storeTitle: el.storeTitle,
@@ -360,6 +372,7 @@ export default {
             materialNumber: this.tempOut.materialNumber,
             orderId: this.row.orderId,
             supportItemId: this.tempOut.id,
+            stockCode: el.code,
           };
           total = total + el.count;
           temArray.push(temObj);
@@ -368,6 +381,10 @@ export default {
       let surplus =
         Number(this.tempOut.count) -
         Number(this.tempOut.outCount ? this.tempOut.outCount : 0);
+      if (total == 0) {
+        this.$Message.error("请输入出库数");
+        return;
+      }
       if (total <= surplus) {
         let parms = {
           main: {
@@ -392,8 +409,19 @@ export default {
       }
     },
     moveEnd() {
-      this.tableHeight1 = this.splitHeight * this.split;
-      this.tableHeight2 = this.splitHeight * (1 - this.split);
+      //alert(this.split.toFixed(2))
+
+      if (this.split.toFixed(2) <= 0.3) {
+        this.tableHeight1 = this.splitHeight * this.split.toFixed(2) - 30;
+      } else if (this.split.toFixed(2) <= 0.4) {
+        this.tableHeight1 = this.splitHeight * this.split.toFixed(2) - 15;
+      } else if (this.split.toFixed(2) <= 0.5) {
+        this.tableHeight1 = this.splitHeight * this.split.toFixed(2) - 5;
+      } else {
+        this.tableHeight1 = this.splitHeight * this.split.toFixed(2) + 30;
+      }
+      //this.tableHeight1 = this.splitHeight * (this.split.toFixed(2));
+      this.tableHeight2 = this.splitHeight * (1 - this.split.toFixed(2));
     },
     inputChange(row, index) {
       //输入数量

pages/aps/supprotMain/api.js

@@ -42,4 +42,8 @@ export default {
   listbysupportitem(params) {//查询所有或单个表单出库信息
     return Api.post(`${resourceUrl}/outitem/listbysupportitem`, params);
   },
+  deleteitem(params) {//撤销出库单
+    return Api.post(`${resourceUrl}/outmain/deleteitem`, params);
+  },
+  
 }

pages/aps/supprotMain/index.vue

@@ -75,11 +75,8 @@ export default {
           width:150,
           render: (h, params) => {
             return h(
-              "op",
+              "span",
               {
-                attrs: {
-                  oprate: "detail",
-                },
                 style: {
                   color: this.setName(this.statuList,params.row.status).color,
                 },
@@ -88,7 +85,6 @@ export default {
             );
           },
         },
-        { key: "status1", title: this.l("status1"), align: "center",width:150, },
         {
           title: "操作",
           key: "action",
@@ -108,7 +104,7 @@ export default {
                 "op",
                 {
                   attrs: { oprate: "edit" },
-                 
+                  on: { click: () => this.getOutBound(params.row) },
                 },
                 "出库单"
               ),

pages/aps/supprotMain/outbound.vue

@@ -9,6 +9,10 @@
         状态：
         <state code="outstore.status" :value="row.status+''" type="text"></state>
       </span>
+    </p>
+    <Card :padding="0">
+      <p slot="title">申请单物料列表</p>
+      <div slot="extra">
         <Button
         type="primary"
         shape="circle"
@@ -17,7 +21,7 @@
         size="small"
         @click="openMore"
       >{{butTxt}}</Button>
-    </p>
+      </div>
       <Table
         :columns="cols"
         :data="datas"
@@ -28,8 +32,10 @@
         @on-current-change="curChange"
         :height="tableHeight1"
       ></Table>
-
-    <div class="mt20 mb50">
+    </Card>
+    <div class="mt20 mb60">
+    <Card :padding="0">
+      <p slot="title">出库物料库房库位列表</p></p>
       <Table
         :columns="colsList"
         :data="dataList"
@@ -38,6 +44,7 @@
         border
         @on-selection-change="selectChange"
       ></Table>
+    </Card>
     </div>
     <div>
       <FooterToolbar v-show="footerToolbar" class="ftball">
@@ -46,6 +53,9 @@
         <Button @click="cancelBatch">取消</Button>
       </FooterToolbar>
     </div>
+    <Modal v-model="msgInfo" :title="title" @on-ok="applicationOk">
+      <p>确定撤回出库物料？</p>
+    </Modal>
   </div>
 </template>
 <script>
@@ -88,11 +98,8 @@ export default {
           width: 150,
           render: (h, params) => {
             return h(
-              "op",
+              "span",
               {
-                attrs: {
-                  oprate: "detail",
-                },
                 style: {
                   color: this.setName(this.statuList1, params.row.status).color,
                 },
@@ -121,6 +128,11 @@ export default {
           title: this.l2("materialName"),
           align: "left",
         },
+        {
+          key: "stockCode",
+          title: this.l2("stockCode"),
+          align: "left",
+        },
         {
           key: "materialNumber",
           title: this.l2("materialNumber"),
@@ -185,6 +197,9 @@ export default {
       iconLabel: "md-arrow-dropdown",
       tempList: [],
       tempID: null,
+      msgInfo: false,
+      title: "",
+      outBoldArr: [],
     };
   },
   props: {
@@ -255,7 +270,7 @@ export default {
     curChange(curRow, oldRow) {
       //当前物料过滤
       //点击物料行
-     this.getList(curRow.id)
+      this.getList(curRow.id);
     },
     getList(id) {
       let parm = { supportItemId: id };
@@ -302,12 +317,29 @@ export default {
     },
     application(type, row) {
       //撤销出库(批量type 1 ，单挑type 2)
+      this.outBoldArr = [];
+      let outArr = [];
       if (type == 1) {
-        alert(JSON.stringify(this.tempOut));
+        //alert(JSON.stringify(this.tempOut));
+        this.tempOut.forEach((el) => {
+          outArr.push(el.id);
+        });
       } else {
-        alert(JSON.stringify(this.row));
+        //alert(JSON.stringify(row));
+        outArr.push(row.id);
       }
+
+      this.title = "提示信息";
+      this.msgInfo = true;
+      this.outBoldArr = outArr;
+    },
+    applicationOk() {
+      Api.deleteitem(this.outBoldArr).then((res) => {
+        if (res.success) {
           this.load(this.eid);
+        }
+      });
+      this.msgInfo = false;
     },
     l(key) {
       key = "support_main" + "." + key;

src/assets/css/base.css

@@ -181,6 +181,12 @@ div::-webkit-scrollbar-corner {
 .mb50 {
   margin-bottom: 50px;
 }
+.mb60 {
+  margin-bottom: 60px;
+}
+.mb70 {
+  margin-bottom: 70px;
+}
 .ml0 {
   margin-left: 0;
 }