tijiao

build/utils.js

@@ -16,7 +16,8 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 
-let devModules = ['all'];
+// let devModules = ["index", "appoint", "statisticalReport"];
+let devModules = ["all"];
 
 // let devModules = ['index','appoint','sale','statisticalReport','RMS','TMS','WMS']
 // let devModules = ["index", "ADMINISTRATORS", "RMS"];

config/index.js

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

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

@@ -1720,7 +1720,9 @@ export default {
           //是否磅重销售
           isPoundSale: 0,
           //备注
-          truckRemark: ""
+          truckRemark: "",
+          //物资名称
+          materialName: ""
         };
         mapItem.truckNo = item.cxh;
         mapItem.shipperAddressId = item.saleShipperAddressId;
@@ -1732,6 +1734,7 @@ export default {
         mapItem.steelMeters = item.meterNumber;
         mapItem.isPoundSale = item.isPound;
         mapItem.truckRemark = item.truckRemark;
+        mapItem.materialName = item.materialName;
         mapList.push(mapItem);
       });
       let mapValue = {

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

@@ -2,10 +2,28 @@
   <!-- 销售订单页面 -->
   <div class="salePlan">
     <div class="top">
+      <span>制单时间:</span>
+      <el-date-picker
+        v-model="startTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker
+        v-model="endTime"
+        type="datetime"
+        placeholder="选择日期"
+        style="width:200px"
+      >
+      </el-date-picker>
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
+
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
+
       <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
@@ -69,17 +87,31 @@
         </el-tab-pane>
         <!-- 已派车 -->
         <el-tab-pane label="已派车" name="first">
-          <mergeRowTable v-bind.sync="option" ref="table3"> </mergeRowTable>
+          <mergeRowTable v-bind.sync="option" ref="table3">
+            <el-table-column fixed="right" label="操作" width="160">
+              <template slot-scope="scope">
+                <el-button
+                  @click="updateDriverTel(scope)"
+                  type="text"
+                  size="small"
+                  >修改司机电话号码</el-button
+                >
+              </template>
+            </el-table-column>
+          </mergeRowTable>
         </el-tab-pane>
       </el-tabs>
     </div>
   </div>
 </template>
 <script>
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   name: "saleOrder",
   data() {
     return {
+      endTime: null,
+      startTime: null,
       carrierText: null,
       dialogTableVisible: false,
       activeName: "four",
@@ -91,8 +123,8 @@ export default {
       option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/ams/getHaveCarTruckNoList?apiId=466",
-        comparison: "saleOrderMaterialId",
-        columnIndexs: [0, 1, 2, 3, 7, 8, 9, 10, 11, 12, 13, 14, 15]
+        comparison: "orderId",
+        columnIndexs: [0, 1, 2, 3, 4, 5, 9, 10, 11, 12, 13, 14, 15, 16]
       },
       option2: {
         // 表格请求数据的地址
@@ -123,6 +155,40 @@ export default {
     };
   },
   methods: {
+    updateDriverTel(scope) {
+      console.log(scope.row);
+      this.$prompt(
+        `请输入--${scope.row.capacityNumber}--修改后的电话号码`,
+        `${scope.row.capacityNumber}--修改前的电话号码:${scope.row.drivelTel}`,
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          inputPlaceholder: "输入正确格式的电话号码",
+          center: true
+        }
+      )
+        .then(({ value }) => {
+          this.axios
+            .post("/api/v1/uc/updateDriverTel", {
+              orderId: parseInt(scope.row.orderId),
+              driverTel: value
+            })
+            .then(res => {
+              if (res.data.code == "200") {
+                this.$message.success("修改成功");
+                this.getRequestUrl();
+              } else {
+                this.$message.error("修改失败");
+              }
+            })
+            .catch(() => {
+              this.$message.error("修改失败");
+            });
+        })
+        .catch(() => {
+          this.$message.info("取消修改");
+        });
+    },
     getRequestUrl() {
       this.option.requestUrl =
         "/api/v1/ams/getHaveCarTruckNoList?apiId=466&i=" + new Date();
@@ -167,6 +233,12 @@ export default {
       console.log(tab, event);
     },
     onclick() {
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime && this.endTime) {
+        startTime = sjTime(this.startTime);
+        endTime = sjTime(this.endTime);
+      }
       if (this.activeName == "four") {
         this.option4.requestUrl =
           "/api/v1/ams/getSteelTruckNoList?apiId=411&con=" + this.input;
@@ -176,7 +248,14 @@ export default {
           "/api/v1/ams/getNoCarTruckNoList?apiId=466&con=" + this.input;
       } else if (this.activeName == "first") {
         this.option.requestUrl =
-          "/api/v1/ams/getHaveCarTruckNoList?apiId=466&con=" + this.input;
+          "/api/v1/ams/getHaveCarTruckNoList?apiId=466&con=" +
+          this.input +
+          "&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&i=" +
+          new Date();
       }
     },
     seeclick(saleOrderId) {

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

@@ -3,50 +3,53 @@
   <div class="purchasFuelNewMonitor">
     <el-form :inline="true" style="margin-top :5px">
       <el-form-item>
-        <label class="el-form-item__label" style="width: auto;">计毛时间：</label>
-            <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>
+        <label class="el-form-item__label" style="width: auto;"
+          >计毛时间：</label
+        >
+        <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-form-item>
       <el-form-item>
         <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button>
+          ><i class="el-icon-download"></i>导出(Excel)</el-button
+        >
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="refresh">
-        <i class="el-icon-refresh"></i>刷新
-      </el-button>
+          <i class="el-icon-refresh"></i>刷新
+        </el-button>
       </el-form-item>
       <el-form-item>
         <span style="margin-left: 1rem;width:68px">合计净重：</span>
-      <el-input
-        v-model="totalNumber"
-        :disabled="true"
-        style="width: 150px;"
-      ></el-input>
+        <el-input
+          v-model="totalNumber"
+          :disabled="true"
+          style="width: 150px;"
+        ></el-input>
       </el-form-item>
       <el-form-item>
         <span style="margin-left: 1rem;width:68px">合计车数：</span>
-      <el-input
-        v-model="totalCapacity"
-        :disabled="true"
-        style="width: 150px;"
-      ></el-input>
+        <el-input
+          v-model="totalCapacity"
+          :disabled="true"
+          style="width: 150px;"
+        ></el-input>
       </el-form-item>
-    </el-form> 
+    </el-form>
     <div class="table">
       <!-- <dilTable ref="excelDom" v-bind.sync="option" :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang" @func="func" @requestQuery="requestQuery" :pageSize = "pageSize"></dilTable> -->
       <mergeRowTable ref="excelDom" v-bind.sync="option"> </mergeRowTable>
@@ -67,7 +70,7 @@ export default {
       option: {
         requestUrl: "",
         comparison: "orderNumber",
-        columnIndexs: [0, 1, 2, 3, 11, 12, 13, 16, 21, 22, 23, 24]
+        columnIndexs: [0, 1, 2, 3, 4, 5, 6, 13, 14, 15, 16, 19, 24, 25, 26]
       },
       startTime: null,
       endTime: null,
@@ -200,5 +203,4 @@ export default {
 };
 </script>
 
-<style lang="scss">
-</style>
+<style lang="scss"></style>