tijiao

build/utils.js

@@ -15,8 +15,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index','appoint'，'configManager','homepage','inward','queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-let devModules = ['all'];
-// let devModules = ['index','appoint','sale','TMS','statisticalReport'];
+// let devModules = ['all'];
+let devModules = ['index','SporadicManage','statisticalReport','inward'];
 // let devModules = ['index','appoint','TMS'];
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;

config/index.js

@@ -64,9 +64,9 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    target: "http://172.16.33.166:8080",
+    // target: "http://172.16.33.166:8080",
     // target: "http://192.168.1.102:8019",
-    // target: "http://192.168.1.112:8019",
+    target: "http://192.168.1.114:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

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

@@ -228,7 +228,7 @@
       <el-button type="primary" @click="makeSure1">确定</el-button>
       <div class="tablecls">
         <!-- 查询所有的物资 -->
-        <dilTable ref="materialTable" v-bind.sync="materialOptions" @radio-change="selectionChange">
+        <dilTable ref="materialTable" v-bind.sync="materialOptions" @radio-change="selectionChange" :drawer="aaadrawer">
         </dilTable>
       </div>
     </el-drawer>
@@ -270,6 +270,7 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      aaadrawer:false,
       disabled:false,
       materialTimes:null,
       options: [],
@@ -312,7 +313,7 @@ export default {
           width: "140",
         },
         {
-          prop: "Specification",
+          prop: "materialSpecification",
           label: "规格型号",
           width: "140",
         },
@@ -382,14 +383,22 @@ export default {
         });
       }
     },
+    table(val){
+      if(val){
+        this.aaadrawer = false;
+      }else{
+        this.aaadrawer = true;
+      }
+    }
   },
   methods: {
     onclickMaterial(){
         if(this.inputMaterial != null){
           this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395"+ "&index=" + this.inputMaterial
+          this.inputMaterial = null
         }
         else{
-          this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395"
+          this.materialOptions.requestUrl = "/api/v1/uc/selectAllMaterialName?apiId=395" + "&i=" + new Date() 
         }
     },
     onInputTimes(){
@@ -490,11 +499,16 @@ export default {
     },
     // 返回主界面
     makeSure1() {
+      if(this.tableData.length != 0){
+        this.$message.error("物资已选择，请删除后重试")
+        return
+      }
+      if(JSON.stringify(this.selectionList1).length != 2){
         this.selectionList1.materialPriority = 1
         this.tableData.push(this.selectionList1);    
         this.selectionList1 = [];
         this.table = false;
-        console.log(this.selectionList1)
+      }
     },
     //取消模态框多选
     open() {

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

@@ -56,6 +56,11 @@
           </el-table-column>      
           </dilTable>
         </el-tab-pane>
+         <!-- 已完成 -->
+        <el-tab-pane label="已完成" name="completed">
+          <dilTable v-bind.sync="completed">
+          </dilTable>
+        </el-tab-pane>
       </el-tabs>
     </div> 
   </div>
@@ -79,6 +84,9 @@ export default {
       first: {
         requestUrl:"",
       },
+      completed:{
+        requestUrl:"",
+      },
       //车辆信息的表格
       truck: {
         requestUrl: "/api/v1/oms/getCapacityAndDriverList?apiId=246&carrierId=" + '',
@@ -136,13 +144,16 @@ export default {
       }
       if(getCookie('orgCode') == "chengyunshang"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&carrierId=" + getCookie("userId") ,
-        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" + getCookie("userId")
+        this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" + getCookie("userId"),
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&carrierId=" + getCookie("userId")
       }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4"
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5"
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2"
       }else{
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&userId=" + getCookie("orgCode")
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&userId=" + getCookie("orgCode")
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&userId=" + getCookie("orgCode")
       }    
   },
   
@@ -159,12 +170,16 @@ export default {
       if(getCookie('orgCode') == "chengyunshang"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&carrierId=" + getCookie("userId") + "&test=" + new Date(),
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&carrierId=" + getCookie("userId") + "&test=" + new Date()
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&carrierId=" + getCookie("userId") + "&test=" + new Date()
+      
       }else if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&test=" + new Date()
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&test=" + new Date()
+        this.completed.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&test=" + new Date()
       }else{
         this.first.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=4&userId=" + getCookie("orgCode") + "&test=" + new Date()
         this.Received.requestUrl = "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=5&userId=" + getCookie("orgCode") + "&test=" + new Date()
+        this.completed.requestUrl =  "/api/v1/oms/getOthersOrderMesToSend?apiId=386&type=3&orderStatus=2&userId=" + getCookie("orgCode") + "&test=" + new Date()     
       }
     },
     //删除运输订单

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

@@ -445,7 +445,8 @@ 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&i=" + new Date();
+        this.purchaseOrder.requestUrl = "/api/v1/ams/getPurchaseOrderList?apiId=81" + "&sendCompId=" +
+          this.supplierId + "&i=" + new Date();
       }
       
     },

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

@@ -43,7 +43,7 @@
             </dilTable>
           </el-tab-pane>
           <el-tab-pane label="已下发" name="second">
-            <dilTable v-bind.sync="second">
+            <dilTable v-bind.sync="second" @func="func">
               <el-table-column fixed="right" label="操作" width="100">
                 <template slot-scope="scope">
                   <el-button
@@ -51,7 +51,7 @@
                     size="mini"
                     @click="stopRequirement(scope)"
                   >
-                    停用
+                    {{startStop}}
                   </el-button>
                 </template>
               </el-table-column>
@@ -67,6 +67,8 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
+      startStop:null,
+      startStopValue:null,
       inputText: "",
       first: {
         // first请求数据的地址
@@ -93,6 +95,16 @@ export default {
     }
   },
   methods: {
+    func(res){
+        console.log(res.list)
+        res.list.forEach(e => {
+            if(e.enable = "未启用"){
+               this.startStop = "启用"
+            }else{
+               this.enable = "停用"
+            }
+        });
+    },
     getRequestUrl(){
       if(getCookie("orgCode") == "dagangadmin"||getCookie("orgCode")=="zidonghuabu"){
         this.first.requestUrl = "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=0" + "&t=" + new Date()

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

@@ -55,12 +55,14 @@ export default {
         console.log(res)
         var resultNetWeightTotalFirst = 0
         var resultNetWeightTotalSecond = 0
+        var currentCapacityTotal = 0
         res.list.forEach(e => {
+          currentCapacityTotal++
           resultNetWeightTotalFirst = resultNetWeightTotalFirst+e.netWeightFirst
           resultNetWeightTotalSecond = resultNetWeightTotalSecond + e.netWeightSecond
         });
         this.totalNumberFrist = resultNetWeightTotalFirst.toFixed(2) + "t" + "/" + resultNetWeightTotalSecond.toFixed(2) + "t"
-        this.totalCapacity = res.total;
+        this.totalCapacity = currentCapacityTotal;
     },
     getRequestUrl(){
         this.option.requestUrl = '/api/v1/tms/getPurInwardReport?apiId=441&startTime=null&endTime=null&i=' +new Date();

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

@@ -64,11 +64,13 @@ export default {
      func(res){
         console.log(res)
         var resultNetWeightTotal = 0
+        var currentCapacityTotal = 0
         res.list.forEach(e => {
+          currentCapacityTotal++
           resultNetWeightTotal = resultNetWeightTotal+e.resultNetWeight
         });
         this.totalNumber = resultNetWeightTotal.toFixed(2) + "t"
-        this.totalCapacity = res.total;
+        this.totalCapacity = currentCapacityTotal;
     },
     getRequestUrl(){
         if (

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

@@ -59,11 +59,13 @@ export default {
     func(res){
         console.log(res)
         var resultNetWeightTotal = 0
+        var currentCapacityTotal = 0
         res.list.forEach(e => {
+          currentCapacityTotal++
           resultNetWeightTotal = resultNetWeightTotal+e.resultNetWeight
         });
         this.totalNumber = resultNetWeightTotal.toFixed(2) + "t"
-        this.totalCapacity = res.total;
+        this.totalCapacity = currentCapacityTotal;
     },
     getRequestUrl(){
         if(getCookie("orgCode") == "dagangadmin" || getCookie("orgCode") == "zidonghuabu"){