sfdsdfsf

build/utils.js

@@ -15,7 +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", "inward", "ADMINISTRATORS"];
+let devModules = ["index", "appoint", "inward"];
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];
 // let devModules = ["index", "inward", "statisticalReport"];

config/index.js

@@ -66,7 +66,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:80",
-    // target: "http://localhost:8080",
+    // target: "http://localhost:8081",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

src/views/appoint/components/saleContract/addSaleOrder.vue

@@ -32,6 +32,8 @@
           placeholder="请输入下单客户名称"
           :trigger-on-focus="false"
           @select="handleSelectConsignee"
+          style="width:300px"
+          :disabled="consigneeDisable"
         >
           <template slot-scope="{ item }">
             <div class="name">{{ item.consigneeCompanyName }}</div>
@@ -649,11 +651,13 @@
 </template>
 <script>
 import PageTitle from "@/components/Page/Title";
+import { getCookie } from "@/utils/util.js";
 import { sjTime, isIntegerNumber } from "@/utils/sharedJsFile";
 export default {
   components: { PageTitle },
   data() {
     return {
+      consigneeDisable: false,
       isCellClick: 0,
       truckRemark: "",
       shipperName: "四川省达州钢铁集团有限责任公司",
@@ -898,6 +902,46 @@ export default {
     //获取所有的业务员
     this.getAllsaleMan();
   },
+  mounted() {
+    if (getCookie("orgCode") == "shouhuokehu") {
+      this.consigneeDisable = true;
+      this.axios
+        .get("/api/v1/uc/getConsigneeByuserid?userId=" + getCookie("userId"))
+        .then(res => {
+          console.log(res);
+          if (res.status == 200) {
+            console.log(res.data);
+            this.consigneeName = res.data.consigneeCompanyName;
+            this.consigneeId = res.data.consigneeId;
+            //带出摘要
+            this.axios
+              .post("/api/v1/uc/getSaleArea?receiveId=" + this.consigneeId)
+              .then(res => {
+                this.remarks = res.data.data;
+              });
+            this.axios
+              .post(
+                "/api/v1/ams/matchingAddressRecently?receiveId=" +
+                  this.consigneeId
+              )
+              .then(res => {
+                const place = res.data.data;
+                console.log(place);
+                this.saleShipperAddressName =
+                  place[0].addressProvince +
+                  place[0].addressDistrict +
+                  place[0].addressTown +
+                  place[0].place;
+                this.saleShipperAddressId = place[0].shipperAddressId;
+                this.place1 = place[0].place;
+                this.saleMan = place[0].salerId;
+                this.saleOrderConsigneeTel = place[0].saleOrderConsigneeTel;
+              });
+          }
+        });
+      console.log(getCookie("userId"));
+    }
+  },
   methods: {
     onblur() {
       this.isCellClick = 0;

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

@@ -47,6 +47,9 @@
         <el-tab-pane label="已结算" name="second">
           <dilTable v-bind.sync="options2"> </dilTable>
         </el-tab-pane>
+        <el-tab-pane label="未生成详单" name="third">
+          <dilTable v-bind.sync="options3"> </dilTable>
+        </el-tab-pane>
       </el-tabs>
     </div>
   </div>
@@ -81,6 +84,9 @@ export default {
         // second请求数据的地址
         requestUrl: ""
       },
+      options3: {
+        requestUrl: ""
+      },
       //是否打开修改详单地址弹出框
       dialogFormVisible: false,
       //原详单单价
@@ -110,6 +116,7 @@ export default {
   created() {
     this.options1GetRequestUrl();
     this.options2GetRequestUrl();
+    this.options3GetRequestUrl();
   },
   methods: {
     func(res) {
@@ -176,6 +183,9 @@ export default {
           new Date();
       }
     },
+    options3GetRequestUrl() {
+      this.options3.requestUrl = "/api/v1/bms/getNoInwardDetails?apiId=490";
+    },
     toInsert() {
       this.$router.push("/insertCheckInventory");
     },
@@ -211,6 +221,14 @@ export default {
               endTime +
               "&i" +
               new Date();
+            this.options3.requestUrl =
+              "/api/v1/bms/getNoInwardDetails?apiId=490" +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
           } else if (getCookie("orgCode") == "chengyunshang") {
             this.options1.requestUrl =
               "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&carrierSsoId=" +
@@ -230,6 +248,15 @@ export default {
               endTime +
               "&i" +
               new Date();
+            this.options3.requestUrl =
+              "/api/v1/bms/getNoInwardDetails?apiId=490&carrierSsoId=" +
+              getCookie("userId") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
           } else {
             this.options1.requestUrl =
               "/api/v1/bms/getInwardWeightDetailsOrder?apiId=461&orderType=11&detailStatus=0&userId=" +
@@ -249,6 +276,15 @@ export default {
               endTime +
               "&i" +
               new Date();
+            this.options3.requestUrl =
+              "/api/v1/bms/getNoInwardDetails?apiId=490&userId=" +
+              getCookie("orgCode") +
+              "&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i" +
+              new Date();
           }
         } else {
           this.startTime = null;

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

@@ -55,7 +55,12 @@
             </dilTable>
           </el-tab-pane>
           <el-tab-pane label="已下发" name="second">
-            <dilTable v-bind.sync="second" ref="table1">
+            <dilTable
+              v-bind.sync="second"
+              ref="table1"
+              :isPagination="false"
+              :pageSize="2000"
+            >
               <el-table-column fixed="right" label="操作" width="80">
                 <template slot-scope="scope">
                   <el-button

src/views/statisticalReport/components/salesLogisticsStatistics/saleChemicalCokeForm.vue

@@ -11,7 +11,6 @@
             v-model="startTime"
             type="datetime"
             placeholder="选择日期时间"
-            style="width:200px"
           >
           </el-date-picker>
           <span>至</span>
@@ -19,7 +18,6 @@
             v-model="endTime"
             type="datetime"
             placeholder="选择日期时间"
-            style="width:200px"
           >
           </el-date-picker>
           <el-form-item>
@@ -34,7 +32,7 @@
             <el-input
               v-model="inputMaterial"
               style="width:200px"
-              placeholder="输入仓库或物资名称或备注"
+              placeholder="可输入条件查询"
               clearable
             ></el-input>
           </el-form-item>
@@ -54,7 +52,7 @@
           </el-button>
         </el-form-item>
         <el-form-item>
-          <span style="margin-left: 1rem;width:68px">合计净重：</span>
+          <span>合计净重：</span>
           <el-input
             v-model="totalNumber"
             :disabled="true"
@@ -62,7 +60,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <span style="margin-left: 1rem;width:68px">合计车数：</span>
+          <span>合计车数：</span>
           <el-input
             v-model="totalCapacity"
             :disabled="true"