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

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/plan/addAccessory.vue

@@ -26,11 +26,11 @@
             :max="row.totalCount"
             :min="0"
             v-model="row.count"
-            @on-blur="inputChange1(i,row,index)"
+            @on-change="inputChange1(i,row,index)"
           />
         </template>
         <template slot-scope="{ row, index }" slot="remarks">
-          <Input type="text" v-model="row.remark" @on-blur="inputChange1(i,row,index)" />
+          <Input type="text" v-model="row.remark" @on-change="inputChange1(i,row,index)" />
         </template>
       </Table>
     </div>

pages/aps/plan/api.js

@@ -32,7 +32,7 @@ export default {
         return  Api.get(`${PlanUrl}/messchedule/getpoolordercount`);
     },
     listbyuser(params) {//获取当前登录用户可操作的排产
-        return Api.post(`${authUrl}/api/services/app/setschedulecompany/listbyuser`, params);
+        return Api.post(`${Platform}/setschedulecompany/listbyuser`, params);
     },
     moveintoai(){////跳转进入智能排产池前判断
         return Api.post(`${PlanUrl}/messchedule/moveintoai`);

pages/aps/plan/detailAccessory.vue

@@ -10,7 +10,8 @@
       <Content>
         <div class="mb20" v-for="(item,index) in datas" :key="index">
           <p class="fwBold" :id="'item'+index">
-            齐套日期：{{item.finishDate}}
+            <span >申请编号：{{item.code}}</span>
+            <span class="ml20">齐套日期：{{item.finishDate}}</span>
             <span class="ml20">申请人：{{item.creator}}</span>
             <span class="ml20">申请时间：{{item.applyTime}}</span>
           </p>
@@ -44,6 +45,8 @@ export default {
     return {
       disabled: false,
       deletelModal: false,
+      statuList: this.$store.getters.dictionaryByKey("accessory.status") || [],
+      statuList1: this.$store.getters.dictionaryByKey("outstore.status") || [],
       curId: 0,
       editIndex: -1,
       editNum: "",
@@ -74,6 +77,17 @@ export default {
           title: this.l("status"),
           align: "center",
           width: 120,
+          render: (h, params) => {
+            return h(
+              "span",
+              {
+                style: {
+                  color: this.setName(this.statuList1, params.row.status).color,
+                },
+              },
+              this.setName(this.statuList1, params.row.status).name
+            );
+          },
         },
         {
           key: "remark",
@@ -135,7 +149,8 @@ export default {
         }
       });
     },
-    application(type, arr) {//撤回配套申请 type:0 单条 1 全部
+    application(type, arr) {
+      //撤回配套申请 type:0 单条 1 全部
       let parms = [];
       if (type == 0) {
         parms.push(arr.id);
@@ -144,16 +159,38 @@ export default {
           parms.push(ele.id);
         });
       }
-      Api.batchdelete(parms).then(res=>{
-        if(res.success&&res.result)
-        {
+      Api.batchdelete(parms).then((res) => {
+        if (res.success && res.result) {
           this.$Message.success("撤销成功");
           this.load(this.eid);
-          this.$emit('on-ok')
+          this.$emit("on-ok");
         }
-      })
+      });
+    },
+    //配套申请
+    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;
     },
-     l(key) {
+    l(key) {
       let vkey = "support_item" + "." + key;
       return this.$t(vkey) || key;
     },

pages/aps/plan/editAccessory.vue

@@ -5,7 +5,7 @@
       订单编号：{{mesCodes}}
       <span class="ml20">产品名称：{{productNames}}</span>
       <span class="ml20">生产数量：{{counts}}</span>
-      <span class="fr mr20">
+      <span class="fr mr20" v-if="false">
         <a href="javascript:;">出库单</a>
       </span>
       <span class="fr mr20">
@@ -32,7 +32,7 @@
             :max="row.totalCount-row.applicationNumber"
             :min="0"
             v-model="row.count"
-            @on-blur="inputChange1(i,row,index)"
+            @on-change="inputChange1(i,row,index)"
             :disabled="row._disabled"
           />
         </template>
@@ -40,7 +40,7 @@
           <Input
             type="text"
             v-model="row.remark"
-            @on-blur="inputChange1(i,row,index)"
+            @on-change="inputChange1(i,row,index)"
             :disabled="row._disabled"
           />
         </template>

pages/aps/supprotMain/accessory.vue

@@ -12,41 +12,48 @@
     </p>
     <Split v-model="split" mode="vertical" @on-move-end="moveEnd">
       <div slot="top" class="demo-split-pane" style="background:#fff;height:100%">
-        <Table
-          :columns="cols"
-          :data="datas"
-          class="tableCommon"
-          border
-          highlight-row
-          @on-current-change="curChange"
-          :height="tableHeight1"
-        ></Table>
+        <Card :padding="0">
+          <p slot="title">申请单物料列表</p>
+          <Table
+            :columns="cols"
+            :data="datas"
+            class="tableCommon"
+            border
+            highlight-row
+            @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>
-        <Table
-          :columns="colsOut"
-          :data="datasOut"
-          class="tableCommon"
-          border
-          highlight-row
-          :height="tableHeight2-40"
-          v-show="showBottom"
-        >
-          <template slot-scope="{ row, index }" slot="counts">
-            <InputNumber
-              :max="row.nowTotal"
-              :min="0"
-              v-model="row.count"
-              @on-blur="inputChange(row,index)"
-            />
-          </template>
-        </Table>
+        <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"
+            class="tableCommon"
+            border
+            highlight-row
+            :height="tableHeight2-40"
+          >
+            <template slot-scope="{ row, index }" slot="counts">
+              <InputNumber
+                :max="row.nowTotal"
+                :min="0"
+                v-model="row.count"
+                @on-change="inputChange(row,index)"
+              />
+            </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",

pages/aps/supprotMain/outbound.vue

@@ -9,35 +9,42 @@
         状态：
         <state code="outstore.status" :value="row.status+''" type="text"></state>
       </span>
-      <Button
-        type="primary"
-        shape="circle"
-        :icon="iconLabel"
-        class="fr"
-        size="small"
-        @click="openMore"
-      >{{butTxt}}</Button>
     </p>
-    <Table
-      :columns="cols"
-      :data="datas"
-      class="tableCommon"
-      ref="gridTable"
-      border
-      highlight-row
-      @on-current-change="curChange"
-      :height="tableHeight1"
-    ></Table>
-
-    <div class="mt20 mb50">
+    <Card :padding="0">
+      <p slot="title">申请单物料列表</p>
+      <div slot="extra">
+        <Button
+          type="primary"
+          shape="circle"
+          :icon="iconLabel"
+          class="fr"
+          size="small"
+          @click="openMore"
+        >{{butTxt}}</Button>
+      </div>
       <Table
-        :columns="colsList"
-        :data="dataList"
+        :columns="cols"
+        :data="datas"
         class="tableCommon"
-        ref="gridTable1"
+        ref="gridTable"
         border
-        @on-selection-change="selectChange"
+        highlight-row
+        @on-current-change="curChange"
+        :height="tableHeight1"
       ></Table>
+    </Card>
+    <div class="mt20 mb60">
+      <Card :padding="0">
+        <p slot="title">出库物料库房库位列表</p>
+        <Table
+          :columns="colsList"
+          :data="dataList"
+          class="tableCommon"
+          ref="gridTable1"
+          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,11 @@ export default {
       iconLabel: "md-arrow-dropdown",
       tempList: [],
       tempID: null,
+      msgInfo: false,
+      title: "",
+      outBoldArr: [],
+      orderId: 0,
+      curRowId: 0,
     };
   },
   props: {
@@ -220,7 +237,13 @@ export default {
           //this.datas = r.result.children;
           this.tempList = r.result.children;
           this.datas = this.tempList.slice(0, 1);
+          this.tableHeight1 = "96";
+          this.butTxt = "更多";
+          this.iconLabel = "md-arrow-dropdown";
+
           let parm = { orderId: r.result.orderId };
+          this.orderId = r.result.orderId;
+          this.curRowId = 0;
           Api.listbysupportitem(parm).then((res) => {
             if (res.success) {
               this.dataList = res.result;
@@ -255,7 +278,8 @@ export default {
     curChange(curRow, oldRow) {
       //当前物料过滤
       //点击物料行
-     this.getList(curRow.id)
+      this.curRowId = curRow.id;
+      this.getList(curRow.id);
     },
     getList(id) {
       let parm = { supportItemId: id };
@@ -264,7 +288,7 @@ export default {
           this.dataList = res.result;
         }
       });
-       this.footerToolbar = false;
+      this.footerToolbar = false;
     },
     openMore() {
       //展开收起按钮
@@ -302,12 +326,33 @@ 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.load(this.eid);
+
+      this.title = "提示信息";
+      this.msgInfo = true;
+      this.outBoldArr = outArr;
+    },
+    applicationOk() {
+      Api.deleteitem(this.outBoldArr).then((res) => {
+        if (res.success) {
+          if (this.curRowId != 0) {
+            this.getList(this.curRowId);
+          } else {
+            this.load(this.eid);
+          }
+        }
+      });
+      this.msgInfo = false;
     },
     l(key) {
       key = "support_main" + "." + key;

pages/resourceManagement/productionResources/set.vue

@@ -39,7 +39,8 @@
       </Col>
       <Col :span="12">
         <FormItem label="能力值" prop="capabilityValue">
-          <Input v-model="formItem.capabilityValue" placeholder="请输入能力值"></Input>
+          <!-- <Input v-model="formItem.capabilityValue" placeholder="请输入能力值"></Input> -->
+          <InputNumber v-model="formItem.capabilityValue" :max="100" :min="1"></InputNumber>
         </FormItem>
       </Col>
     </Row>
@@ -61,7 +62,7 @@ export default {
       formItem: {
         equip_name: "",
         equip_id: "",
-        isimportant: 1,
+        isimportant: "1",
         capabilityValue: ""
       },
       formItem1: {
@@ -113,11 +114,16 @@ export default {
         this.formItem.equip_name = r.result.title;
         this.formItem.equip_id = r.result.code;
         this.formItem.capabilityValue = r.result.capabilityValue;
-        this.formItem.isimportant = r.result.isimportant || "1";
+        
         this.formItem1.calendarwork_pk = r.result.calKey;
         this.formItem2.calendarovertime_pk = r.result.holidayKey;
         this.formItem1.equip_pk = r.result.id;
         this.formItem2.equip_pk = r.result.id;
+        if(r.result.isimportant){
+          this.formItem.isimportant = r.result.isimportant+"";
+        }else{
+          this.formItem.isimportant = "1";
+        }
       });
     },
     handleSubmit() {

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

static/config.js

@@ -28,6 +28,7 @@ window.technologyUrl =`http://${address}:10000/technology/`;//新工艺规程接
 window.iconImg = `/imgicon/`;
 window.mncImg = `/images/mnc/`;//mnc图片
 window.material = `http://${address}:10000/material`; //物料管理
+window.Platform = `http://${address}:10000/platform`; //计划管理10131
 
 /* window.systemUrl = `http://${address}:10020/api/services/app`; //System-api 系统管理（基础数据）
 window.authUrl = `http://${address}:10010`; //Authentication-api //统一登录认证