销售钢材报表

src/views/TMS/components/bmsship/addTwoSectionHandleFee.vue

@@ -72,7 +72,7 @@
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
-      size="50%"
+      size="60%"
     >
       <el-input
         placeholder="请输入内容"
@@ -131,7 +131,7 @@ export default {
       batchName:null,
       cargoPictureUrl: "",
       batchOption: {
-        requestUrl: "/api/v1/uc/selectPurchaseOrderForShip?apiId=502",
+        requestUrl: "/api/v1/uc/getBatchOfNotice?apiId=513",
         selectionType: "radio",
         map: [],
       },
@@ -159,7 +159,7 @@ export default {
     onclick(a) {
         if(a==5){
             this.batchOption.requestUrl =
-            "/api/v1/uc/selectPurchaseOrderForShip?apiId=502&index=" + this.input;
+            "/api/v1/uc/getBatchOfNotice?apiId=513&index=" + this.input;
         }else if(a==6){
             this.contractPriceOption.requestUrl =
             "/api/v1/rms/selectbmsshipContractPriceList?apiId=500&con=" + this.input;

src/views/TMS/components/bmsship/detailsStatement.vue

@@ -75,7 +75,7 @@
             border
             stripe
             style="width: 100%; margin-top: 20px"
-            max-height="600px"
+            max-height="500px"
             :row-style="{ height: '30px' }"
             :cell-style="{ fontWeight: '700' }"
             class="table"

src/views/TMS/components/bmsship/editThreeSectionHandleFee.vue

@@ -74,7 +74,7 @@
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
-      size="50%"
+      size="60%"
     >
       <el-input
         placeholder="请输入内容"
@@ -133,7 +133,7 @@ export default {
       batchName:null,
       cargoPictureUrl: "",
       batchOption: {
-        requestUrl: "/api/v1/uc/selectPurchaseOrderForShip?apiId=502",
+        requestUrl: "/api/v1/uc/getBatchOfNotice?apiId=513",
         selectionType: "radio",
         map: [],
       },
@@ -178,7 +178,7 @@ export default {
     onclick(a) {
         if(a==5){
             this.batchOption.requestUrl =
-            "/api/v1/uc/selectPurchaseOrderForShip?apiId=502&index=" + this.input;
+            "/api/v1/uc/getBatchOfNotice?apiId=513&index=" + this.input;
         }else if(a==6){
             this.contractPriceOption.requestUrl =
             "api/v1/rms/selectbmsshipContractPriceList?apiId=500&con=" + this.input;

src/views/TMS/components/bmsship/editTwoSectionHandleFee.vue

@@ -133,7 +133,7 @@ export default {
       batchName:null,
       cargoPictureUrl: "",
       batchOption: {
-        requestUrl: "/api/v1/uc/selectPurchaseOrderForShip?apiId=502",
+        requestUrl: "/api/v1/uc/getBatchOfNotice?apiId=513",
         selectionType: "radio",
         map: [],
       },
@@ -178,7 +178,7 @@ export default {
     onclick(a) {
         if(a==5){
             this.batchOption.requestUrl =
-            "/api/v1/uc/selectPurchaseOrderForShip?apiId=502&index=" + this.input;
+            "/api/v1/uc/getBatchOfNotice?apiId=513&index=" + this.input;
         }else if(a==6){
             this.contractPriceOption.requestUrl =
             "api/v1/rms/selectbmsshipContractPriceList?apiId=500&con=" + this.input;

src/views/inward/components/inwardFactory/timeTaskResult.vue

@@ -41,7 +41,7 @@
         <!-- 运输进程详情 -->
         <el-table-column type="expand" width="1">
           <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
+            <el-form label-position="center" inline class="demo-table-expand" style="margin-left:30%">
               <div v-if="false">{{ props }}</div>
               <div>
                 <el-table :data="tableData1" border>

src/views/inward/components/inwardSettlement/detailOrder.vue

@@ -86,9 +86,9 @@
         <el-tab-pane label="已结算" name="second">
           <dilTable v-bind.sync="options2" @func="func2"> </dilTable>
         </el-tab-pane>
-        <el-tab-pane label="未生成详单" name="third">
+        <!-- <el-tab-pane label="未生成详单" name="third">
           <dilTable v-bind.sync="options3" @func="func3"> </dilTable>
-        </el-tab-pane>
+        </el-tab-pane> -->
       </el-tabs>
     </div>
   </div>
@@ -255,7 +255,6 @@ export default {
       } else {
         orderList = this.orderList1;
       }
-      debugger;
       this.axios
         .post("/api/v1/bms/newInwardSettle", { orderIds: orderList })
         .then(res => {

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

@@ -3,7 +3,7 @@
   <div class="transportOrder">
     <div class="transportOrder_top">
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
+      <el-button type="primary" class="btn" @click="getRequestUrl">
         <i class="el-icon-search"></i>查询
       </el-button>
       <el-badge
@@ -183,13 +183,17 @@ export default {
         "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3";
     } else {
       this.first.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1";
+        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1&userId=" +
+        getCookie("orgCode");
       this.Received.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5";
+        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&userId=" +
+        getCookie("orgCode");
       this.completed.requestUrl =
-        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2";
+        "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&userId=" +
+        getCookie("orgCode");
       this.dispatched.requestUrl =
-        "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3";
+        "/api/v1/ams/getPurRequirementList?apiId=431&requirementStatus=1&planStatus=3&userId=" +
+        getCookie("orgCode");
     }
     // this.initWebSocket();
   },
@@ -265,19 +269,25 @@ export default {
     },
     getRequestUrl() {
       if (getCookie("orgCode") == "chengyunshang") {
-        this.first.requestUrl =
+        (this.first.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1&carrierId=" +
           this.carrierUserId +
           "&test=" +
-          new Date();
-        this.Received.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&planEnableStatus=1&carrierId=" +
-          this.carrierUserId +
-          "&test=" +
-          new Date();
-        this.completed.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&carrierId=" +
-          getCookie("userId");
+          new Date() +
+          "&con=" +
+          this.input),
+          (this.Received.requestUrl =
+            "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5&planEnableStatus=1&carrierId=" +
+            this.carrierUserId +
+            "&test=" +
+            new Date() +
+            "&con=" +
+            this.input),
+          (this.completed.requestUrl =
+            "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2&carrierId=" +
+            getCookie("userId") +
+            "&con=" +
+            this.input);
       } else if (
         getCookie("orgCode") == "dagangadmin" ||
         getCookie("orgCode") == "zidonghuabu"
@@ -285,24 +295,50 @@ export default {
         this.first.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1" +
           "&test=" +
-          new Date();
+          new Date() +
+          "&con=" +
+          this.input;
+
         this.Received.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5" +
           "&test=" +
-          new Date();
+          new Date() +
+          "&con=" +
+          this.input;
+
         this.completed.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2";
+          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2" +
+          "&test=" +
+          new Date() +
+          "&con=" +
+          this.input;
       } else {
         this.first.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=4&planEnableStatus=1" +
           "&test=" +
-          new Date();
+          new Date() +
+          "&con=" +
+          this.input +
+          "&userId=" +
+          getCookie("orgCode");
+
         this.Received.requestUrl =
           "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=5" +
           "&test=" +
-          new Date();
+          new Date() +
+          "&con=" +
+          this.input +
+          "&userId=" +
+          getCookie("orgCode");
+
         this.completed.requestUrl =
-          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2";
+          "/api/v1/oms/getPurInwardOrderList?apiId=432&orderStatus=2" +
+          "&test=" +
+          new Date() +
+          "&con=" +
+          this.input +
+          "&userId=" +
+          getCookie("orgCode");
       }
     },
     getTruckRequestUrl() {