电子对账单

pages/materiel/classification/api.js

 import Api from '@/plugins/request'
 export default {
-    index:`${systemUrl}/category/paged`,
+    index:`${material}/category/paged`,
     paged(params){
-        return Api.post(`${systemUrl}/category/paged`,params);
+        return Api.post(`${material}/category/paged`,params);
     },
     // indexSlecet:`${systemUrl}/coderule/paged`,
     pagedSlecet(params){
     return Api.post(`${systemUrl}/coderule/paged`,params);
     },
     listTable(params){
-        return Api.post(`${systemUrl}/custompropertydefinition/list`,params);
+        return Api.post(`${material}/custompropertydefinition/list`,params);
     },
     list(params){
-        return Api.post(`${systemUrl}/category/list`,params);
+        return Api.post(`${material}/category/list`,params);
     },
     get(params){
-    return Api.get(`${systemUrl}/category/get`,params);
+    return Api.get(`${material}/category/get`,params);
     },
     create(params){
-    return Api.post(`${systemUrl}/category/create`,params);
+    return Api.post(`${material}/category/create`,params);
     },
     update(params){
-    return Api.post(`${systemUrl}/category/update`,params);
+    return Api.post(`${material}/category/update`,params);
     },
     delete(id) {
-    return Api.delete(`${systemUrl}/category/delete`,{params:{id:id}});
+    return Api.delete(`${material}/category/delete`,{params:{id:id}});
     },
     getChildren(params){
         return Api.get(`${systemUrl}/Dictionary/getChildren`,params); //字典

pages/materiel/codeRule/api.js

 import Api from '@/plugins/request'
 export default {
-    index:`${systemUrl}/coderule/paged`,
+    index:`${material}/coderule/paged`,
     paged(params){
-    return Api.post(`${systemUrl}/coderule/paged`,params);
+    return Api.post(`${material}/coderule/paged`,params);
     },
     get(params){
-    return Api.get(`${systemUrl}/coderule/get`,params);
+    return Api.get(`${material}/coderule/get`,params);
     },
     create(params){
-    return Api.post(`${systemUrl}/coderule/create`,params);
+    return Api.post(`${material}/coderule/create`,params);
     },
     update(params){
-    return Api.post(`${systemUrl}/coderule/update`,params);
+    return Api.post(`${material}/coderule/update`,params);
     },
     delete(id) {
-    return Api.delete(`${systemUrl}/coderule/delete`,{params:{id:id}});
+    return Api.delete(`${material}/coderule/delete`,{params:{id:id}});
     },
     deletes(params) {
-    return Api.post(`${systemUrl}/coderule/batchdelete`,params);
+    return Api.post(`${material}/coderule/batchdelete`,params);
     }
     }
\ No newline at end of file

pages/materiel/masterData/api.js

 import Api from '@/plugins/request'
 export default {
-    index:`${systemUrl}/material/paged`,
-     lists:`${systemUrl}/actionlog/list`,
+    index:`${material}/material/paged`,
+     lists:`${material}/actionlog/list`,
     paged(params){
-        return Api.post(`${systemUrl}/material/paged`,params);
+        return Api.post(`${material}/material/paged`,params);
     },
     pagedSlecet(params){
         return Api.post(`${systemUrl}/coderule/paged`,params);
         },
     list(params){
-        return Api.post(`${systemUrl}/category/list`,params);
+        return Api.post(`${material}/category/list`,params);
     },
     listTable(params){
-        return Api.post(`${systemUrl}/custompropertydefinition/list`,params);
+        return Api.post(`${material}/custompropertydefinition/list`,params);
     },
     get(params){
-    return Api.get(`${systemUrl}/material/get`,params);
+    return Api.get(`${material}/material/get`,params);
     },
     create(params){
-    return Api.post(`${systemUrl}/material/createnew`,params);
+    return Api.post(`${material}/material/createnew`,params);
     },
     update(params){
-    return Api.post(`${systemUrl}/material/updatenew`,params);
+    return Api.post(`${material}/material/updatenew`,params);
     },
     delete(id) {
-    return Api.delete(`${systemUrl}/material/delete`,{params:{id:id}});
+    return Api.delete(`${material}/material/delete`,{params:{id:id}});
     },
     categoryList(params){
-        return Api.post(`${systemUrl}/actionlog/list`,params);
+        return Api.post(`${material}/actionlog/list`,params);
     },
     batchstart(params) {
         return Api.post(`${workflowUrl}/instance/batchstart`, params); //送审

pages/order/bill/index.vue

+<template>
+  <div>
+    <Row>
+      <Col span="4">
+        <Input
+          v-model="keys"
+          search
+          placeholder="请输入订单编号"
+          enter-button
+          style="width:280px;margin:10px 5px;"
+        />
+      </Col>
+      <Col span="20" style="margin-top:15px">
+        <a @click="clickSeach">高级搜索</a>
+      </Col>
+    </Row>
+
+    <div class="bill">
+      <div class="bill-l">
+        <h4 class="title1">订单信息</h4>
+        <div class="body" v-for="(li,index) in listData" :key="index">
+          <div class="l-list">
+            <Row class="title-i">
+              <Col :span="12">{{li.name}}</Col>
+              <Col :span="12">{{li.code}}</Col>
+            </Row>
+            <Row class="bady-c">
+              <Col :span="12">订单状态：{{li.status}}</Col>
+              <Col :span="12">紧急程度：{{li.chengdu}}</Col>
+            </Row>
+            <Row class="bady-c">
+              <Col :span="12">数量：{{li.cont}}</Col>
+              <Col :span="12">任务类型：{{li.type}}</Col>
+            </Row>
+            <div class="bady-c">图号：{{li.tuhao}}</div>
+            <div class="bady-c">批次号：{{li.picihao}}</div>
+            <div class="bady-c">项目号：{{li.xianmuhao}}</div>
+          </div>
+        </div>
+      </div>
+      <div class="bill-r">
+        <h4 class="title2">工单信息</h4>
+        <div class="r-list">
+          <div v-for="(li,index) in WorkOrder1" :key="index">
+            <div
+              class="gong-dan"
+              :class="li.status==0?'gong-dan0':li.status==1?'gong-dan1':li.status==2?'gong-dan2':'gong-dan3'"
+            >
+              <div>{{li.title}}</div>
+              <div>{{li.name}}</div>
+              <div>{{li.PaigaongTime}}</div>
+              <div>{{li.finshTime}}</div>
+              <div>{{li.startTime}}</div>
+              <div>{{li.endTime}}</div>
+            </div>
+          </div>
+        </div>
+        <div class="r-list">
+          <div v-for="(li,index) in WorkOrder2" :key="index">
+            <div
+              class="gong-dan"
+              :class="li.status==0?'gong-dan0':li.status==1?'gong-dan1':li.status==2?'gong-dan2':'gong-dan3'"
+            >
+              <div>{{li.title}}</div>
+              <div>{{li.name}}</div>
+              <div>{{li.PaigaongTime}}</div>
+              <div>{{li.finshTime}}</div>
+              <div>{{li.startTime}}</div>
+              <div>{{li.endTime}}</div>
+            </div>
+          </div>
+        </div>
+        <div class="r-list">
+          <div v-for="(li,index) in WorkOrder3" :key="index">
+            <div
+              class="gong-dan"
+              :class="li.status==0?'gong-dan0':li.status==1?'gong-dan1':li.status==2?'gong-dan2':'gong-dan3'"
+            >
+              <div>{{li.title}}</div>
+              <div>{{li.name}}</div>
+              <div>{{li.PaigaongTime}}</div>
+              <div>{{li.finshTime}}</div>
+              <div>{{li.startTime}}</div>
+              <div>{{li.endTime}}</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <Modal v-model="modal" title="高级搜索" @on-ok="ok" @on-cancel="cancel">
+      <Form ref="form" :model="entity" :rules="rules" :label-width="90">
+        <Row>
+          <Col :span="12">
+            <FormItem label="订单" prop="name">
+              <Input v-model="entity.name"></Input>
+            </FormItem>
+          </Col>
+          <Col :span="12">
+            <FormItem label="编号" prop="code">
+              <Input v-model="entity.code"></Input>
+            </FormItem>
+          </Col>
+          <Col :span="12">
+            <FormItem label="级别" prop="jibie">
+              <Input v-model="entity.jibie"></Input>
+            </FormItem>
+          </Col>
+          <Col :span="12">
+            <FormItem label="类型" prop="type">
+              <Input v-model="entity.type"></Input>
+            </FormItem>
+          </Col>
+        </Row>
+      </Form>
+    </Modal>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      keys: "",
+      modal: false,
+      entity: {},
+      listP: [
+        {
+          name: "DDBH_20200219",
+          code: "CR200J0001",
+          status: "已派发",
+          chengdu: "一级",
+          cont: 100,
+          type: "正式计划",
+          tuhao: "CLX-2K-001",
+          picihao: "20200519-LXG-001",
+          xianmuhao: "XM-20200519-LXG"
+        },
+        {
+          name: "DDBH_20200220",
+          code: "CR200J0001",
+          status: "已派发",
+          chengdu: "一级",
+          cont: 100,
+          type: "正式计划",
+          tuhao: "CLX-2K-001",
+          picihao: "20200519-LXG-001",
+          xianmuhao: "XM-20200519-LXG"
+        },
+        {
+          name: "DDBH_20200221",
+          code: "CR200J0001",
+          status: "已派发",
+          chengdu: "一级",
+          cont: 100,
+          type: "正式计划",
+          tuhao: "CLX-2K-001",
+          picihao: "20200519-LXG-001",
+          xianmuhao: "XM-20200519-LXG"
+        }
+      ],
+      WorkOrder1: [
+        {
+          title: "10 作业准备",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 0 //已完成
+        },
+        {
+          title: "20 接触网断电",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 1 //正在进行
+        },
+        {
+          title: "30 有电作业",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 2
+        },
+        {
+          title: "40 泄露试验",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 2
+        },
+        {
+          title: "50 票据填写",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 2
+        }
+      ],
+      WorkOrder2: [
+        {
+          title: "10 车顶作业",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 0 //已完成
+        },
+        {
+          title: "20 司机室作业",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 3
+        },
+        {
+          title: "30 机械间作业",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 2
+        },
+        {
+          title: "40 走行部作业",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 2
+        }
+      ],
+      WorkOrder3: [
+        {
+          title: "10 接车入库",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 0 //已完成
+        },
+        {
+          title: "20 接触网断电",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 1 //正在进行
+        },
+        {
+          title: "30 车顶检查",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 1
+        },
+        {
+          title: "40 电务检查",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 2
+        },
+        {
+          title: "50 供电",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 2
+        },
+        {
+          title: "50 供电",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 2
+        },
+        {
+          title: "50 供电",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 2
+        },
+        {
+          title: "50 供电",
+          name: "机加中心-操作工1",
+          PaigaongTime: "2020-03-12",
+          finshTime: "2020-03-12",
+          startTime: "2020-03-12",
+          endTime: "2020-03-12",
+          status: 2
+        }
+      ]
+    };
+  },
+  computed: {
+    listData() {
+      return this.listP.filter(u => {
+        return u.name.indexOf(this.keys) > -1;
+      });
+    }
+  },
+  methods: {
+    clickSeach() {
+      this.modal = true;
+    },
+    ok() {
+      this.modal = false;
+    },
+    cancel() {
+      this.modal = false;
+    }
+  }
+};
+</script>
+<style lang="less" >
+.bill {
+  display: flex;
+  display: -webkit-flex;
+  height: 83vh;
+  overflow: hidden;
+  margin-left: 3px;
+  border: 1px solid #e4e6ed;
+  .bill-l {
+    width: 400px;
+    border: 1px solid #e4e6ed;
+    height: 100%;
+    overflow: hidden;
+    .title1 {
+      background: rgba(81, 90, 110, 0.2);
+      height: 49px;
+      line-height: 49px;
+      padding-left: 10px;
+    }
+    .body {
+      padding: 15px 0;
+      border-bottom: 1px solid #cacbd0;
+      .l-list {
+        width: 360px;
+        height: 200px;
+        border: 1px solid #2680eb;
+        border-radius: 4px;
+        margin: 0 auto;
+        .title-i {
+          height: 36px;
+          line-height: 36px;
+          padding-left: 10px;
+          border-bottom: 1px dashed #a7b8cc;
+          font-weight: bold;
+          color: rgba(38, 128, 235, 1);
+        }
+        .bady-c {
+          height: 31px;
+          line-height: 31px;
+          padding-left: 10px;
+        }
+      }
+    }
+  }
+  .bill-r {
+    width: 1495px;
+    height: 100%;
+    border: 1px solid #e4e6ed;
+    overflow: hidden;
+    .title2 {
+      background: rgba(38, 128, 235, 0.2);
+      height: 49px;
+      line-height: 49px;
+      padding-left: 10px;
+    }
+    .r-list {
+      width: 1495px;
+      display: -webkit-flex;
+      display: flex;
+      padding: 15px 10px;
+      border-bottom: 1px solid #cacbd0;
+      flex-wrap: nowrap;
+      overflow-x: auto;
+      .gong-dan {
+        div {
+          height: 30px;
+        }
+        div:nth-child(1) {
+          color: #515a6e;
+          font-size: 16px;
+          font-weight: bold;
+        }
+        div:nth-child(2) {
+          color: #515a6e;
+          font-size: 14px;
+        }
+        div:nth-child(3),
+        div:nth-child(4),
+        div:nth-child(5),
+        div:nth-child(6) {
+          color: #666;
+          font-size: 14px;
+          opacity: 0.6;
+        }
+      }
+      .gong-dan0 {
+        width: 198.5px;
+        height: 200px;
+        background-image: url("../../../assets/images/bill/black.png");
+        padding: 13px 20px;
+        // float: left;
+        div:nth-child(1),
+        div:nth-child(2) {
+          color: #515a6e;
+        }
+      }
+      .gong-dan1 {
+        width: 198.5px;
+        height: 200px;
+        background-image: url("../../../assets/images/bill/green.png");
+        padding: 13px 20px;
+        // float: left;
+        div:nth-child(1),
+        div:nth-child(2) {
+          color: #0dd78d;
+        }
+      }
+      .gong-dan2 {
+        width: 198.5px;
+        height: 200px;
+        background-image: url("../../../assets/images/bill/blue.png");
+        padding: 13px 20px;
+        // float: left;
+        div:nth-child(1),
+        div:nth-child(2) {
+          color: #2680eb;
+          opacity: 0.5;
+        }
+      }
+      .gong-dan3 {
+        width: 198.5px;
+        height: 200px;
+        background-image: url("../../../assets/images/bill/red.png");
+        padding: 13px 20px;
+        // float: left;
+        div:nth-child(1),
+        div:nth-child(2) {
+          color: #fe7777;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file

pages/technology/productMix/product/api.js

@@ -34,7 +34,7 @@ export default {
         return Api.delete(`${technologyUrl}productinfo/deletebom`,{params:{id:id,levelId:levelId,rootProductId:rootProductId}});
         },
     materiallist(params){
-    return Api.post(`${systemUrl}/material/materiallist`,params);//物料
+    return Api.post(`${material}/material/materiallist`,params);//物料
     },
     alltree(params){
     return Api.post(`${technologyUrl}productinfo/alltree`,params); //bom树

static/config.js

@@ -25,6 +25,7 @@ window.crmUrl = `http://${address}:10000/crm`; //crm客户、合同、项目管
 window.apsUrl = `http://${systemApi.aps}:10111/api/services/app`;//aps排产
 window.technologyUrl =`http://${address}:10000/technology/`;//新工艺规程接口
 window.iconImg = `/imgicon/`;
+window.material = `http://${address}:10000/material`; //物料管理
 
 /* window.systemUrl = `http://${address}:10020/api/services/app`; //System-api 系统管理（基础数据）
 window.authUrl = `http://${address}:10010`; //Authentication-api //统一登录认证