is

.eslintrc.js

@@ -57,6 +57,6 @@ module.exports = {
     'no-dupe-args': 2,
     // 不能有声明后未被使用的变量或参数
     'no-unused-vars': 0,
-    "space-before-function-paren": 0
+    'space-before-function-paren': 0
   }
 };

config/index.js

@@ -54,6 +54,14 @@ let proxyTable = {
       "^/api/v1/cd": "/api/v1/cd"
     }
   },
+  //抽奖结果的接口
+  "/icore.icp.web/game/v1": {
+    target: "http://172.16.33.166:9002",
+    ws: true,
+    pathRewrite: {
+      "^/icore.icp.web/game/v1": "/v1"
+    }
+  },
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:8080",

nginx.conf

@@ -37,6 +37,15 @@ http {
 
     server {
         root /usr/share/nginx/html/;
+
+        location /game/v1 {
+            rewrite ^/icore.icp.web/game(.*)$ /$1 break; # 去除本地接口/api前缀, 否则会出现404
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_pass http://oa-system-game-service/v1; # 转发地址
+        }
+        
         location /views/icore.icp.web/pass/v1 {
 		    rewrite ^/b/(.*)$ /$1 break; # 去除本地接口/api前缀, 否则会出现404
 			port_in_redirect   on;

src/views/RMS/components/editConsignee.vue

@@ -21,7 +21,6 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
 export default {
   components: { PageTitle },
   data() {
@@ -68,19 +67,12 @@ console.log(this.$route.params)
          consigneeAbbreviation:this.form1.consigneeAbbreviation,
          consigneeRegisteredAddress:this.form1.consigneeRegisteredAddress,
          consigneeReceiveAddress:this.form1.consigneeReceiveAddress,
-         consigneeRegistrationTime:this.form1. consigneeRegistrationTime,
+         consigneeRegistrationTime:this.form1.consigneeRegistrationTime,
          consigneeContactName:this.form1.consigneeContactName,
          consigneeContactTel:this.form1.consigneeContactTel,
        };
        if(
-        RmsConsignee.consigneeId == null ||
-        RmsConsignee.companyName == null ||
-        RmsConsignee.consigneeAbbreviation==null ||
-        RmsConsignee. consigneeRegisteredAddress ==null ||
-        RmsConsignee.consigneeReceiveAddress == null ||
-        RmsConsignee.consigneeRegistrationTime == null ||
-        RmsConsignee.consigneeContactName == null ||
-        RmsConsignee.consigneeContactTel == null
+        RmsConsignee.companyName == null 
        )this.$message.error("存在空值！");
         console.log( this.$route.params.consigneeId);
         this.axios

src/views/RMS/components/editSupplier.vue

@@ -21,7 +21,7 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { sjTime,isNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
@@ -69,11 +69,7 @@ export default {
         supplierContactNumber: this.form1.supplierContactNumber
       };
        if(
-        RmsSupplier.supplierName==null ||
-        RmsSupplier.supplierAddress==null ||
-        RmsSupplier.supplierRegisterDate==null ||
-        RmsSupplier.supplierContactsName==null ||
-        RmsSupplier.supplierContactNumber==null 
+        RmsSupplier.supplierName==null 
       )this.$message.error("存在空值！");
         this.axios
           .post(

src/views/RMS/components/supplier.vue

@@ -71,6 +71,7 @@ export default {
         center: true,
       })
         .then(() => {
+          console.log("scope.row.supplierId",scope.row.supplierId)
           this.axios
             .post("/api/v1/rms/deleteSupplier/" + scope.row.supplierId)
             .then((res) => {

src/views/SporadicManage/components/sporadicMaterial/transportAppoint/addSporadicTransportAppoint.vue

@@ -550,8 +550,13 @@ export default {
       }
     },
     ondrawer(num) {
-      this.line.requestUrl =
+      if(getCookie("orgCode") == "biemeierchejian"){
+        this.line.requestUrl =
+          "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&con=" + "二厂：零星单拼出厂" 
+      }else{
+        this.line.requestUrl =
           "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" + "&t=" + new Date();
+      }
       this.drawer = true;
       this.a = num;
     },

src/views/SporadicManage/components/sporadicMaterial/transportOrder/addTransportOrder.vue

@@ -158,7 +158,12 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
         this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&dispatchStatus=0&sporadicStatus=0";
-    } else{
+    }else if(getCookie("orgCode") == "biemeierchejian") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con=" + "铁专线精煤"; 
+      this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&dispatchStatus=0&sporadicStatus=0&userId=" + getCookie("orgCode");
+    }
+    else{
         this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
         this.option.requestUrl = "/api/v1/ams/getSporadicOrdersList?apiId=439&issueStatus=1&orderType=12&dispatchStatus=0&sporadicStatus=0&userId=" + getCookie("orgCode");
@@ -216,7 +221,12 @@ export default {
         this.truck.requestUrl =
           "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
           getCookie("userId") + "&index="+this.truckText;
-      } else {
+      }else if(getCookie("orgCode") == "biemeierchejian") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con=" + "铁专线精煤" + "&index="+this.truckText;; 
+      
+    } 
+      else {
         this.truck.requestUrl =
           "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&index="+this.truckText;
       }
@@ -226,7 +236,11 @@ export default {
         this.truck.requestUrl =
           "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
           getCookie("userId") + "&i=" + new Date()
-      } else {
+      }else if(getCookie("orgCode") == "biemeierchejian") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con=" + "铁专线精煤" + + "&i=" + new Date(); 
+    } 
+      else {
         this.truck.requestUrl =
           "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&i=" + new Date()
       }
@@ -249,9 +263,13 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
         getCookie("userId") + "&t=" + new Date();
-    } else {
+    }else if(getCookie("orgCode") == "biemeierchejian") {
+      this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con=" + "铁专线精煤" + "&t=" + new Date();
+    }
+     else {
       this.truck.requestUrl =
-        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + + "&t=" + new Date();;
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null  + "&t=" + new Date();
     } 
       this.truckDrawer = true
     },

src/views/SporadicManage/components/sporadicMaterial/transportOrder/transportOrder.vue

@@ -62,6 +62,22 @@
           <dilTable v-bind.sync="completed">
           </dilTable>
         </el-tab-pane>
+         <!-- 已拒绝 -->
+        <el-tab-pane label="已拒绝" name="refused">
+          <dilTable v-bind.sync="refused">
+            <el-table-column
+            fixed="right"
+            label="操作"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button @click="ctrlZClick(scope)" type="text" size="small">
+                撤销
+              </el-button>
+            </template>
+          </el-table-column>
+          </dilTable>
+        </el-tab-pane>
       </el-tabs>
     </div> 
   </div>
@@ -96,6 +112,9 @@ export default {
       },
       completed:{
         requestUrl:"",
+      },
+      refused:{
+        requestUrl:"",
       },
        //车辆的表格
       truck: {
@@ -152,18 +171,33 @@ export default {
       if(getCookie('orgCode') == "chengyunshang"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + getCookie("userId") ,
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + getCookie("userId"),
-        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" + getCookie("userId")
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" + getCookie("userId"),
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" + getCookie("userId")
       }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4"
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5"
         this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2"
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6"
       }else{
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" + getCookie("orgCode")
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" + getCookie("orgCode")
         this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" + getCookie("orgCode")
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" + getCookie("orgCode")
       }
   },
   methods: {
+    //撤销已拒绝的运输订单
+    ctrlZClick(scope){
+        console.log(scope.row.orderId)
+        this.axios.post("/api/v1/oms/refuseCtrlZ",{
+          orderId:scope.row.orderId
+        }).then((res) => {
+          if(res.data.code == '200'){
+             this.$message.success("撤单成功")
+             this.getRequestUrl()
+          }
+        })
+    },
     handleClose(done){
       done()
       this.$message.info("取消修改运力")
@@ -173,14 +207,17 @@ export default {
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&carrierId=" + getCookie("userId") + "&test=" + new Date() ,
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&carrierId=" + getCookie("userId") + "&test=" + new Date()
         this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&carrierId=" + getCookie("userId") + "&test=" + new Date()
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&carrierId=" + getCookie("userId") + "&test=" + new Date()
       }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu" || getCookie("orgCode") == "wuliuchuyunzhongxin"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4" + "&test=" + new Date()
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5" + "&test=" + new Date()
         this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2" + "&test=" + new Date()
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6" + "&test=" + new Date()
       }else{
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=4&userId=" + getCookie("orgCode") + "&test=" + new Date()
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=5&userId=" + getCookie("orgCode") + "&test=" + new Date()
         this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=2&userId=" + getCookie("orgCode") + "&test=" + new Date()
+        this.refused.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=1&orderStatus=6&userId=" + getCookie("orgCode") + "&test=" + new Date()
       }
     },
     getTruckRequestUrl(){

src/views/TMS/components/purchaseChemicalMaterials/transportationReservationAdd.vue

@@ -445,8 +445,9 @@ export default {
       } else if (num == 5) {
         this.line.requestUrl ="/api/v1/rms/getAllLineDesk?apiId=249&lineType=3&i=" + new Date();
       }else if (num == 6) {
-        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&sendCompId="+ this.supplierId+"&i=" + new Date();
+        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81&i=" + new Date();
       }
+      
     },
     // 返回
     onClickCancel() {

src/views/WMS/components/steel/steel_restack.vue

@@ -15,8 +15,8 @@
       </el-button>
     </div>
     <div class="table">
-      <dilTable v-bind.sync="options"> 
-      </dilTable>
+<!--       <dilTable v-bind.sync="options"> 
+      </dilTable> -->
     </div>
       <template>
         <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -54,13 +54,15 @@ export default {
       inputText:"",
       first: {
         // 未分配地址
+        // 请求未下发的数据
         requestUrl:
-          "/api/v1/wms/selectRestackList?apiId=370&DistrubtionStatus=0",
+          "/api/v1/wms/selectRestackList?apiId=438&DistrubtionStatus=0",
       },
       second: {
         // second请求数据的地址
+        // 请求已下发的数据
         requestUrl:
-          "/api/v1/wms/selectRestackList?apiId=370&DistrubtionStatus=1",
+          "/api/v1/wms/selectRestackList2?apiId=440&DistrubtionStatus=1",
       },
       //默认显示待下发的标签页
       activeName: "first",

src/views/WMS/components/steel/steel_restackAdd.vue

@@ -1,6 +1,7 @@
 // 新增倒垛作业
 <template>
     <div class="steel_restackAdd">
+        <PageTitle>返回</PageTitle>
         <div class="search">
             <div class="warehouse">
                 <span>仓库名称：</span>
@@ -36,8 +37,80 @@
                     :value="item.value">
                     </el-option>
                 </el-select>
+
+                <el-button type="primary" class="btn" @click="selectMaterial()">新增倒垛单</el-button>
             </div>
         </div>
+        <el-drawer
+            :visible.sync="table"
+            direction="rtl"
+            size="50%"
+            :show-close="false"
+            >
+            <el-button @click="open">取消</el-button>
+            <el-button type="primary" @click="makeSure1">新增</el-button>
+            <div class="warehouse">
+                <span>仓库名称：</span>
+                <el-select v-model="value1" placeholder="请选择" @change="onchange1()">
+                    <el-option
+                    v-for="(item,i) in options1"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="stack">
+                <span>垛位：</span>
+                <el-select v-model="value2" placeholder="请选择" @change ="onchange2()">
+                    <el-option
+                        v-for="(item,i) in options2"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="gradationnumber">
+                <span>层次：</span>
+                <el-select v-model="value3" placeholder="请选择" @change="onchange3()">
+                    <el-option
+                    v-for="(item,i) in options3"
+                    :key="i"
+                    :label="item.label"
+                    :value="item.value">
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="stack">
+                <span>新垛位：</span>
+                <el-select v-model="value5" placeholder="请选择" @change ="onchange5()">
+                    <el-option
+                        v-for="(item,i) in options5"
+                        :key="i"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </div>
+            <div class="tablecls">
+                <!-- 查询所有的物资 -->
+                <dilTable v-bind.sync="option" @selection-change="selectionChange1">
+                    <!-- 操作列 -->
+                <el-table-column fixed="right" label="件数" prop="quantity" width="100">
+                <template slot-scope="scope">
+                    <el-input
+                    class="textinput1"
+                    v-model.number="scope.row.quantity"
+                    ></el-input>
+                </template>
+                </el-table-column>
+                </dilTable>
+            </div>
+        </el-drawer> 
         <div class="table" >
             <dilTable v-bind.sync="options11"  @selection-change="selectionChange"></diltable>
         </div>
@@ -55,7 +128,7 @@
                 </el-select>
             </div>
             <div class="stack">
-                <span>垛位：</span>
+                <span>新垛位：</span>
                 <el-select v-model="value5" placeholder="请选择" @change ="onchange5()">
                     <el-option
                         v-for="(item,i) in options5"
@@ -71,10 +144,6 @@
          <div class="table">
             <dilTable v-bind.sync="options" ></diltable>
         </div>
-        <div class="button_box">
-            <el-button @click="cancel">取消</el-button>
-            <el-button type="primary" @click="onClickConfirm()">确定</el-button>
-        </div>
     </div>  
 </template>
 
@@ -83,13 +152,15 @@
 export default {
   data(){
     return{
+      table:false,
+      sselectionList1: [],
       form1:{},
       inputText:"",
-        options11:{
-        // first请求数据的地址
-      requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
-      selectionType: "select",
-      },
+      options11:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
+        selectionType: "select",
+      },
       options:{
         // first请求数据的地址
       requestUrl: "/api/v1/wms/getWmspRestackMakeResultList?apiId=106",
@@ -111,7 +182,15 @@ export default {
         options5:[],
         // 选中垛位
         value5:'',
-        inf: {}
+        inf: {},
+        // 每个物资型号的件数
+        quantity:[],
+        option: {
+            // 表格请求物资型号
+            requestUrl: "/api/v1/wms/getMaterialTypeList?warehouseid="+this.value1+"&stackingId="+this.value2+"&gradtionNumber="+this.value3+"&apiId=437",
+            // 控制显示多选列
+            selectionType: "select",
+        },
     }
   },
     mounted(){
@@ -120,6 +199,70 @@ export default {
         this.initialization1();
     },
      methods: {
+        //  创建选择物资型号的方法
+        selectMaterial(){
+            this.table =true
+            this.option.requestUrl="/api/v1/wms/getMaterialTypeList?warehouseid="+this.value1+"&stackingId="+this.value2+"&gradtionNumber="+this.value3+"&apiId=437";
+        },
+         // 返回选中的物资信息
+        selectionChange1(selection) {
+            this.selectionList1 = [];
+            this.selectionList1 = selection;
+        },
+         // 新增倒垛单
+        makeSure1() {
+            this.table = false;
+            let maps =this.selectionList1;
+            console.log("maps",maps)
+            if(
+                maps[0]==null 
+            )this.$message.error("存在空值！");
+            else
+            this.axios
+                .post("/api/v1/wms/createRestackMakeResult?keeperId=2&beforeLevel="+this.value3+"&afterStackingId="+this.value5+"&afterWarehouseId="+this.value1+"&afterBeforeStackingId="+this.value2+"&resultRemark="+"",maps)
+                .then((res) => {
+                    if (res.data.code == 200) {
+                        this.$message({
+                        type: "success",
+                        message: "新增成功!",
+                        });
+                        this.$router.go(-1);
+                    }else{
+                        this.$message.error("新增失败,可能存在重复！");
+                    }
+                    });
+        },
+         open() {
+            if (this.selectionList1.length != 0) {
+                this.$confirm("取消会将已选择的数据清空, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+                })
+                .then(() => {
+                    this.selectionList1 = [];
+                    this.table = false;
+                })
+                .catch(() => {});
+            } else {
+                this.table = false;
+            }
+        },
+        //  添加倒垛单
+        toInsert() {
+        this.$router.push({
+          name: 'steel_restackTransfer',
+          params: {
+              mapValue:{
+                valus:"ssss",
+                cangku:this.value1,
+                 duowei:this.value2,
+                 cengci:this.value3
+              }
+              
+          }
+        })
+        },
          //初始化选择仓库垛位
      initialization(){
          this.axios.get('/api/v1/wms/selectWarehouse').then((res)=>{
@@ -149,15 +292,17 @@ export default {
         }else{
             console.log('-----')
             console.log(this.value2)
-            this.options11.requestUrl="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1+"&stackingId="+this.value2;        
+        //     this.options11.requestUrl="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1+"&stackingId="+this.value2;        
+        //     this.options.requestUrl ="/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1+"&stackingId="+this.value2;   
+        //    console.log(this.options11.requestUrl)
             //选择仓库层次号
             this.axios.get('/api/v1/wms/selectGardationNumber?warehouseid='+this.value1+'&stackingId='+this.value2).then((res)=>{
             this.options3 = res.data.data;
-            
-            
-         })
+            console.log("层次选择"+this.options3)})
+            console.log("fasdsaf")
     }},
     onchange3(){
+        console.log("change3")
         if(this.value2 == ''||this.value1==''){
             this.$message({
                 message: '请选择仓库和垛位之后！再选择',
@@ -171,8 +316,7 @@ export default {
             "&stackingId="+this.value2+"&gradtionNumber="  + this.value3 
         }
     },
-  
-       onchange4(){
+    onchange4(){
         //  console.log(1);
         //  查询选中的仓库垛位
              this.axios.get('/api/v1/wms/selectStackingId?warehouseid='+this.value1).then((res)=>{
@@ -183,9 +327,7 @@ export default {
          })
      },
      onchange5(){
-             this.options.requestUrl = "/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1+"&stackingId="+this.value5;    
-       
-            
+        this.options.requestUrl = "/api/v1/wms/getWmspRestackMakeResultList?apiId=106&warehouseid="+this.value1+"&stackingId="+this.value5;    
     },
 
      onclick(){

src/views/index/components/luckDraw.vue

@@ -4,11 +4,15 @@
         <span class="text">中奖名单</span>
     </div>
     <div class="luckDraw_select">
-        <el-input v-model="form.text1" placeholder="请输入中奖姓名" clearable></el-input>
+        <el-date-picker
+            v-model="form.rflDate"
+            type="date"
+            placeholder="请选择中奖时间">
+            </el-date-picker>
         <el-button type="primary" @click="selectClick" :loading="selectLoading">
             <i class="el-icon-search"></i> 查询
         </el-button>
-        <el-button type="primary" @click="exportData()" :loading="downloadLoading">
+        <el-button type="primary" @click="menuExport" :loading="downloadLoading">
             <i class="el-icon-document"></i> 导出(Excel)
         </el-button>
     </div>
@@ -26,6 +30,7 @@
             :loading="tableLoading"
             element-tableLoading-text="玩命加载中"
             element-tableLoading-spinner="el-icon-tableLoading"
+            size="mini"
         >
             <el-table-column
                 type="index"
@@ -61,6 +66,7 @@
 
 <script>
 import luckDrawTableHead from './luckDrawTableHead'
+import { renderTime,sjTime } from '@/utils/sharedJsFile'
 export default {
     data(){
         return{
@@ -79,17 +85,15 @@ export default {
             //每页显示条目个数
             pageSize: 100,
             //每一页面的显示的条目个数数组
-            pageSizes: [50, 100, 200, 300],
+            pageSizes: [5, 100, 200, 300],
             //当前页数
             currentPage: 1,
             //表格的加载状态
             tableLoading: false,
             //查询条件
             form:{
-                text1:null,
+                rflDate:new Date()
             },
-            //后端给的数据
-            tableData1:[],
             //表格渲染的数据
             tableData:[],
             //表格的表头数据
@@ -102,27 +106,209 @@ export default {
         window.addEventListener("resize", this.getHeight);
         this.getHeight();
         this.initialization();
-        this.changeList();
     },
     methods:{
+        menuExport() {
+      if (this.tableData.length < 1) {
+        this.$message.error("当前无数据可供导出!");
+        return false;
+      }
+      let data = [];
+      let i = 0;
+      this.tableData.forEach((e)=>{
+          i++;
+            data.push({
+                '序号':i,
+                '单位':e.empDept,
+                '工号':e.empNo,
+                '姓名':e.empName,
+                '电话号码':e.cellPhoneNo,
+                '中奖等级':e.prizeDesc,
+                '中奖时间':e.rflDate,
+            })
+        })
+      // 表格标题
+      var dataTitle = this.tableTitle;
+      // 配置文件类型
+      const wopts = {
+        bookType: "xlsx",
+        bookSST: true,
+        type: "binary",
+        cellStyles: true,
+      };
+      this.downloadExl(data, wopts, dataTitle);
+    },
+    downloadExl(json, type, dataTitle) {
+      // 设置表格中cell默认的字体，居中，颜色等
+      var defaultCellStyle = {
+        // font: {
+        //     name: "宋体", sz: 11, color: { auto: 1 } ,
+        // },
+        // border: {
+        //     color: { auto: 1 },
+        //     top: { style: 'thin' },
+        //     bottom: { style: 'thin'},
+        //     left: { style: 'thin' },
+        //     right: { style: 'thin' }
+        // },
+        alignment: {
+          /// 自动换行
+          wrapText: 1,
+          // 居中
+          horizontal: "center",
+          vertical: "center",
+          indent: 0
+        },
+      };
+      var tmpdata = json[0];
+      json.unshift({});
+      var keyMap = []; // 获取keys
+      for (var k in tmpdata) {
+        keyMap.push(k);
+        json[0][k] = k;
+      }
+      var tmpdata = []; // 用来保存转换好的json
+      json
+        .map((v, i) => {
+          let data = keyMap.map((k, j) => {
+            return Object.assign(
+              {},
+              {
+                v: v[k],
+                position:
+                  (j > 25 ? this.getCharCol(j) : String.fromCharCode(65 + j)) +
+                  (i + 2),
+              }
+            );
+          });
+          return data;
+        })
+        .reduce((prev, next) => prev.concat(next))
+        .forEach(
+          (v, i) =>
+            (tmpdata[v.position] = {
+              v: v.v,
+              s: defaultCellStyle,
+            })
+        );
+      var outputPos = Object.keys(tmpdata); // 设置区域,比如表格从A1到D10
+      tmpdata["A1"] = { v: dataTitle };
+      outputPos = ["A1"].concat(outputPos);
+      tmpdata["A1"].s = {
+        font: { sz: 14, bold: true, vertAlign: true },
+        alignment: { vertical: "center", horizontal: "center" },
+      }; // <====设置xlsx单元格样式  fill: { bgColor: { rgb: "E8E8E8"}, fgColor: { rgb: "E8E8E8" } }
+      tmpdata["!merges"] = [
+        {
+          s: { c: 0, r: 0 },
+          e: { c: 6, r: 0 },
+        },
+      ]; // <====合并单元格
+      tmpdata["!cols"] = [
+        { wpx: 50 },
+        { wpx: 150 },
+        { wpx: 80 },
+        { wpx: 80 },
+        { wpx: 100 },
+        { wpx: 80 },
+        { wpx: 100 },
+      ]; // <====设置一列宽度
+
+      var tmpWB = {
+        SheetNames: ["mySheet"], // 保存的表标题
+        Sheets: {
+          mySheet: Object.assign(
+            {},
+            tmpdata, // 内容
+            {
+              "!ref": outputPos[0] + ":" + outputPos[outputPos.length - 1], // 设置填充区域
+            }
+          ),
+        },
+      };
+      var tmpDown = new Blob(
+        [
+          this.s2ab(
+            XLSX.write(
+              tmpWB,
+              // 这里的数据是用来定义导出的格式类型
+              {
+                bookType: type == undefined ? "xlsx" : type.bookType,
+                bookSST: false,
+                type: "binary",
+              },
+              { defaultCellStyle: this.defaultCellStyle }
+            )
+          ),
+        ],
+        {
+          type: "",
+        }
+      );
+      this.saveAs(
+        tmpDown,
+        this.tableTitle +
+          "." +
+          (type.bookType == "biff2" ? "xls" : type.bookType)
+      );
+    },
+    // 获取26个英文字母用来表示excel的列
+    getCharCol(n) {
+      let temCol = "",
+        s = "",
+        m = 0;
+      while (n > 0) {
+        m = (n % 26) + 1;
+        s = String.fromCharCode(m + 64) + s;
+        n = (n - m) / 26;
+      }
+      return s;
+    },
+    s2ab(s) {
+      if (typeof ArrayBuffer !== "undefined") {
+        var buf = new ArrayBuffer(s.length);
+        var view = new Uint8Array(buf);
+        for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xff;
+        return buf;
+      } else {
+        var buf = new Array(s.length);
+        for (var i = 0; i != s.length; ++i) buf[i] = s.charCodeAt(i) & 0xff;
+        return buf;
+      }
+    },
+    // 下载功能
+    saveAs(obj, fileName) {
+      var tmpa = document.createElement("a");
+      tmpa.download = fileName || "未命名";
+      // 兼容ie
+      if ("msSaveOrOpenBlob" in navigator) {
+        window.navigator.msSaveOrOpenBlob(obj, this.tableTitle + ".xlsx");
+      } else {
+        tmpa.href = URL.createObjectURL(obj);
+      }
+      tmpa.click();
+      setTimeout(function () {
+        URL.revokeObjectURL(obj);
+      }, 100);
+    },
+
         getHeight(){
             this.height = window.innerHeight - 200
         },
         initialization(){
-           let arr;
-            for(var i = 0 ;i<1000;i++){
-                let num = i + 1;
-                arr = {
-                    prop1:'测试' + num,
-                }
-                this.tableData1.push(arr)
-            }
-            this.total = this.tableData1.length;
+            this.axios.get('/icore.icp.web/game/v1/rflemplotterys/?rflDate=&pageNum='+this.currentPage+'&pageSize='+this.pageSize+'&lotteryResult=1').then((res)=>{
+                this.tableData = res.data.data.list
+                this.total = res.data.data.total;
+            })
         },
         //查询事件
         selectClick(){
             this.selectLoading = true;
-            console.log(this.form)
+            let Date = renderTime(sjTime(this.form.rflDate)).slice(0,10)
+            this.axios.get('/icore.icp.web/game/v1/rflemplotterys/?rflDate='+Date+'&pageNum='+this.currentPage+'&pageSize='+this.pageSize+'&lotteryResult=1').then((res)=>{
+                this.tableData = res.data.data.list
+                this.total = res.data.data.total;
+            })
             this.selectLoading = false;
         },
         //行间样式
@@ -134,20 +320,7 @@ export default {
             return 'background-color:#0C2278;color:#fff;text-align:center;height:20px'
         },
         changeList(){
-            if(this.tableData1.length){
-                this.tableData = [];
-                var x = (this.currentPage - 1) * this.pageSize;
-                var y = this.currentPage * this.pageSize;
-                if(x >= this.total){
-                    x = this.total;
-                }
-                if(y >= this.total){
-                    y = this.total
-                }
-                for(x;x<y;x++){
-                    this.tableData.push(this.tableData1[x])
-                }
-            }
+            this.initialization();
             this.tableLoading = false;
         },
         handleSizeChange(val) {

src/views/index/components/luckDrawTableHead.js

@@ -1,19 +1,19 @@
 const luckDrawTableHead = [
     {
-        prop:'prop1',
+        prop:'empDept',
         label:'单位'
     },{
-        prop:'prop1',
+        prop:'empName',
         label:'姓名'
     },{
-        prop:'prop1',
+        prop:'empNo',
         label:'工号'
     },{
-        prop:'prop1',
+        prop:'prizeDesc',
         label:'中奖等级'
     },{
-        prop:'prop1',
-        label:'中奖时间',
+        prop:'rflDate',
+        label:'中奖日期',
         width:'220'
     }
 ]

src/views/inward/components/truckAppoint/purInwardRequirement.vue

@@ -144,7 +144,6 @@ export default {
         });
     },
     stopRequirement(scope){
-
       this.$confirm("是否停用", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",

src/views/inward/components/truckOrder/addPurInwardOrder.vue

@@ -167,7 +167,7 @@ export default {
       lineDrawer:false,
       //线路的表格
       line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
+        requestUrl: "",
         selectionType: "radio",
       },
       //已经选择车辆物资信息
@@ -203,10 +203,18 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
         getCookie("userId");
+        this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3"
         this.option.requestUrl = "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&enableStatus=1&planStatus=2&carrierSsoId=" + getCookie("userId");
-    } else {
+    }else if(getCookie("orgCode") == "biemeierchejian"){
+         this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con="+"铁专线精煤";
+        this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3" + "&con=" + "采购内转"
+        this.option.requestUrl = "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&enableStatus=1&planStatus=2";
+    } 
+    else {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
+        this.line.requestUrl = "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3"
         this.option.requestUrl = "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&enableStatus=1&planStatus=2";
     } 
   },
@@ -306,7 +314,10 @@ export default {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" +
         getCookie("userId");
-    } else {
+    }else if(getCookie("orgCode") == "biemeierchejian"){
+         this.truck.requestUrl =
+        "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null + "&con="+"铁专线精煤"
+    }else {
       this.truck.requestUrl =
         "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&carrierSsoId=" + null;
     } 

src/views/statisticalReport/components/inwardReport/putInwardReport.vue

@@ -0,0 +1,108 @@
+<template>
+  <div class="purchasFuelNewMonitor">
+    <div class="frameCalculation">
+      <span>净重时间：</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+      >
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
+      <span style="margin-left: 1rem;">首次/二次合计净重：</span>
+      <el-input v-model="totalNumberFrist" :disabled="true" style="width: 140px;"></el-input>
+      <span style="margin-left: 1rem;">合计车数：</span>
+      <el-input v-model="totalCapacity" :disabled="true" style="width: 100px;"></el-input>
+    </div>
+    <div class="table">
+      <dilTable ref="excelDom" v-bind.sync="option" @func="func"></dilTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import { sjTime } from '@/utils/sharedJsFile';
+import { getCookie } from '@/utils/util.js';
+export default {
+  data() {
+    return {
+      totalNumberSecond:null,
+      totalNumberFrist:null,
+      totalCapacity:null,
+      option: {
+        requestUrl: "",
+      },
+      startTime: null,
+      endTime: null,
+      tableTitle:'零星出厂统计报表'
+    };
+  }, 
+  created(){
+          this.option.requestUrl = '/api/v1/tms/getPurInwardReport?apiId=441&startTime=null&endTime=null&i=' +new Date()
+  },
+  methods: {
+    func(res){
+        console.log(res)
+        var resultNetWeightTotalFirst = 0
+        var resultNetWeightTotalSecond = 0
+        res.list.forEach(e => {
+          resultNetWeightTotalFirst = resultNetWeightTotalFirst+e.netWeightFirst
+          resultNetWeightTotalSecond = resultNetWeightTotalSecond + e.netWeightSecond
+        });
+        this.totalNumberFrist = resultNetWeightTotalFirst.toFixed(2) + "t" + "/" + resultNetWeightTotalSecond.toFixed(2) + "t"
+        this.totalCapacity = res.total;
+    },
+    getRequestUrl(){
+        this.option.requestUrl = '/api/v1/tms/getPurInwardReport?apiId=441&startTime=null&endTime=null&i=' +new Date();
+     
+    },
+    onclick() {
+      let startTime = null;
+      let endTime = null;
+      if(this.startTime){
+        startTime = sjTime(this.startTime);
+      }
+      if(this.endTime){
+        endTime = sjTime(this.endTime);
+      }
+      if(startTime && endTime){
+        if(startTime < endTime){
+          this.option.requestUrl = '/api/v1/tms/getPurInwardReport?apiId=441' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date(); 
+        }else{
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning('开始时间要比结束时间早')
+        }
+      }else{
+        console.log(startTime && endTime)
+        this.getRequestUrl()
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .el-date-editor{
+      margin: 20px;
+    }
+  }
+}
+</style>

src/views/statisticalReport/components/sporadicReport/sporadicReportEnterFactory.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
-      <span>进厂时间：</span>
+      <span>计皮时间：</span>
       <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
       <span>至</span>

src/views/statisticalReport/components/sporadicReport/sporadicReportExFactory.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
-      <span>进厂时间：</span>
+      <span>计毛时间：</span>
       <el-date-picker
         v-model="startTime"
         type="datetime"

src/views/statisticalReport/router/index.js

@@ -15,6 +15,9 @@ import sporadicReportExFactory from '../components/sporadicReport/sporadicReport
 import transportationPerformance from '../components/salesLogisticsStatistics/transportationPerformance.vue'
 import purchaseChemicalMaterialsNew from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsNew.vue'
 import purchaseChemicalMaterialsOld from '../components/purchaseChemicalMaterials/purchaseChemicalMaterialsOld.vue'
+import purInwardReport from '../components/inwardReport/putInwardReport.vue'
+
+
 Vue.use(Router)
 
 const constantRouterMap = [
@@ -34,7 +37,7 @@ const constantRouterMap = [
       {path: 'sporadicReportEnterFactory',name:'sporadicReportEnterFactory',meta:{code:'xtpzgl-yhgl'},component:sporadicReportEnterFactory},
       {path: 'sporadicReportExFactory',name:'sporadicReportExFactory',meta:{code:'xtpzgl-yhgl'},component:sporadicReportExFactory},
       {path: 'transportationPerformance', name: 'transportationPerformance', meta: {code: 'xtpzgl-yhgl'}, component: transportationPerformance},
-
+      {path: 'purInwardReport', name: 'purInwardReport', meta: {code: 'xtpzgl-yhgl'}, component: purInwardReport}
 
     ]
   }