修改销售钢材

build/utils.js

@@ -20,7 +20,7 @@ const devPathSrc = path.resolve(__dirname, "../../../src"); // node_modules应
 // let devModules = ["index", "statisticalReport", "inward"];
 // let devModules = ["index", "WMS", "inward"];
 // let devModules = ["index", "inward", "WMS", "queue"];
-let devModules = ["index", "appoint", "WMS"];
+let devModules = ["index", "appoint", "WMS", "statisticalReport", "inward"];
 
 //let devModules = ["BMS","index","sale","appoint","AMS","queue","QMS","RMS",'statisticalReport'];
 

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",
     // target: "http://192.168.1.101:8080",
     ws: true,
     pathRewrite: {

src/views/RMS/components/addOilPrice.vue

@@ -26,7 +26,7 @@
       :visible.sync="dialogVisible"
       width="30%"
     >
-      <span>注：<span style="color:red;">不能输入特殊符号('#')</span></span>
+      <span>注：<span style="color:red;">建议不能输入特殊符号</span></span>
       <el-input v-model="input" placeholder="请输入内容"></el-input>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
@@ -90,7 +90,7 @@ export default {
         })
       }else{
         this.$message.warning('请输入油品名称')
-      } 
+      }
     },
     makeSure() {
       this.loading = true;
@@ -102,7 +102,7 @@ export default {
       }else if(!isNumber(this.form1.priceValue)){
         this.$message.warning('油品价格必修为整数或者小数')
       }else{
-        state = true;            
+        state = true;
       }
       if(state){
         let RmsOilPrice = {
@@ -176,4 +176,4 @@ export default {
     justify-content: center;
   }
 }
-</style>
+</style>

src/views/RMS/components/oilPrice.vue

@@ -1,5 +1,6 @@
 //资源管理油价管理
 <template>
+  <!-- -->
   <div class="steel_inbound">
     <div class="sache">
       <el-input
@@ -82,7 +83,9 @@ export default {
       this.isKuang = true;
       this.selectLoading = true;
       this.tableLoading = true;
-      if(this.textInput){
+      if(this.textInput!=null){
+        this.textInput=this.textInput.replace('#','%23')
+        this.textInput=this.textInput.replace('%','%25')
         this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&con=" +this.textInput+"&i="+ new Date();
       }else{
         this.options.requestUrl = "/api/v1/rms/getOilPriceResultList?apiId=380&i="+ new Date();

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

@@ -73,7 +73,7 @@
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
-      size="50%"
+      size="60%"
     >
       <el-input
         placeholder="请输入内容"
@@ -132,7 +132,7 @@ export default {
       batchName:null,
       cargoPictureUrl: "",
       batchOption: {
-        requestUrl: "/api/v1/uc/selectPurchaseOrderForShip?apiId=502",
+        requestUrl: "/api/v1/uc/getBatchOfNotice?apiId=513",
         selectionType: "radio",
         map: [],
       },
@@ -160,7 +160,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/editTwoSectionFee.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/importedShip/addLoadShip.vue

@@ -163,7 +163,7 @@ export default {
         resultActualInstallations: this.form.resultActualInstallations,
         resultLoadShipDate: sjTime(this.form.resultLoadShipDate),
         resultIsClear: this.form.resultIsClear,
-        resultArrivalTime: sjTime(this.form.resultArrivalTime),
+        resultArrivalTime: sjTime(this.form.resultLoadShipDate),
         resultOutWharyName: this.form.resultOutWharyName,
         resultOutWharyTime: sjTime(this.form.resultOutWharyTime),
         resultMemo: this.form.resultMemo,
@@ -176,7 +176,7 @@ export default {
         moistureTonnage: this.moistureTonnage,
         waterUnitPrice:this.form.waterUnitPrice,
         unitPriceId:this.form.unitPriceId,
-        //isNeedAssemble:this.form.isNeedAssemble,
+        isNeedAssemble:this.form.isNeedAssemble,
         userId: getCookie("userId"),
       };
       console.log("mapVal:",mapVal);

src/views/TMS/components/importedShip/updateLoadShip.vue

@@ -5,6 +5,12 @@
     <div class="form">
       <div class="form_box">
           <dil-form :formId="136" v-model="form1" ref="from1"></dil-form>
+          <el-form :inline="true">
+          <el-form-item label="是否拼装" >
+            <el-radio v-model="form1.isNeedAssemble" label="否" style="margin-left :10px">否</el-radio>
+            <el-radio v-model="form1.isNeedAssemble" label="是">是</el-radio>
+          </el-form-item>
+        </el-form>
       </div> 
     </div>
     <!-- 确定和取消 -->
@@ -62,6 +68,7 @@ export default {
         resultActualInstallations: this.form1.resultActualInstallations,
         outWharyResultId:this.outWharyResultId,
         // rwarehouseMaterialId: this.form1.rwarehouseMaterialId,
+        isNeedAssemble:this.form1.isNeedAssemble,
         resultArrivalPortTime: sjTime(
           this.form1.resultArrivalPortTime
         ),
@@ -75,7 +82,7 @@ export default {
         resultOutPortName:this.form1.resultOutPortName,
         //planDate:sjTime(this.form1.planDate),
         //planDeliveryDate:sjTime(this.form1.planDeliveryDate),
-        //resultHeavyWeight:this.form1.resultHeavyWeight,
+        resultHeavyWeight:this.form1.resultHeavyWeight,
         userId:getCookie("userId"),
       };
               //判断放货数量是否为数字
@@ -94,7 +101,7 @@ export default {
     
       this.axios
         .post(
-          "/api/v1/tms/updateLoadShip",
+          "/api/v1/tms/updateThreeSectionDetails",
           mapVal
         )
         .then((res) => {

src/views/WMS/components/billingOrder/orderDetails.vue

@@ -52,7 +52,7 @@
         border
         stripe
         style="width: 100%; margin-top: 20px"
-        max-height="700px"
+        max-height="650px"
         @cell-click="cellClik"
         :row-style="{ height: '30px' }"
         :cell-style="{ fontWeight: '700' }"
@@ -164,11 +164,8 @@
           <template slot-scope="scope">
             <el-input
               v-model="scope.row.numberOfFurnaces"
-              v-if="
-                !scope.row.materialName.includes('乱尺') &&
-                  scope.row.input == 'true'
-              "
-              placeholder="格式为:炉号1-件数/炉号2-件数"
+              v-if="!scope.row.materialName.includes('乱尺')"
+              placeholder="炉号1-件数/炉号2-件数"
               style="width:180px"
             >
             </el-input>
@@ -284,6 +281,7 @@ export default {
       let updateMap = {
         orderId: row.orderId,
         saleOrderMaterialId: row.saleOrderMaterialId,
+        saleOrderId: row.saleOrderId,
         mapList: arr
       };
       this.axios
@@ -355,10 +353,16 @@ export default {
     disorderlyOutbound(row) {
       console.log(row);
       this.$set(row, "input", "true");
+      if (!row.materialName.includes("乱尺") && !row.numberOfFurnaces) {
+        this.$message.error("请先输入炉号");
+        return;
+      }
+      console.log(row.numberOfFurnaces);
       if (row.warehouseId == null) {
         this.$message.error("请先选择装货点");
         return;
       }
+      //对炉号解码判断格式件数是否输入准确
       row.userId = getCookie("userId");
       let title = `确定对${row.capacityNumber}的${row.materialNumber}${row.materialName}出库吗?`;
       this.$confirm(title, "提醒", {
@@ -384,6 +388,11 @@ export default {
   .table {
     margin-left: 20px;
     margin-top: 20px;
+    ::-webkit-scrollbar {
+      // width: 20px;
+      height: 30px;
+      background-color: transparent;
+    }
   }
   .address {
     .button-box {

src/views/appoint/components/inward/updateTransPrice.vue

@@ -2,10 +2,6 @@
   <!-- 修改运价 -->
   <div id="contractDetails">
     <page-title>编辑</page-title>
-    <div class="main">
-      <span class="text">修改运价</span>
-      <span class="a"></span>
-    </div>
     <div class="form">
       <div class="form_box">
         <el-form :model="obj" :rules="batchFormRules" label-width="100px" label-position="left">
@@ -13,17 +9,23 @@
             <el-form-item label="运价" prop="priceValue">
               <el-input v-model="obj.priceValue" placeholder="请输入内容" type="number"></el-input>
             </el-form-item>
-            <el-form-item label="货物名称" prop="materialNames">
+            <el-form-item label="物资" prop="materialNames">
               <el-input v-model="obj.materialNames" readonly></el-input>
+              <el-button type="primary" class="btnml" @click="materialDrawer"
+              >浏览物资</el-button>
             </el-form-item>
             <el-form-item label="执行日期" prop="priceDate">
-              <el-input v-model="obj.priceDate" readonly></el-input>
+              <el-date-picker
+                v-model="obj.priceDate"
+                type="date"
+                placeholder="选择日期">
+              </el-date-picker>
             </el-form-item>
             <el-form-item label="运力类型" prop="capacityTypeName">
               <el-input v-model="obj.capacityTypeName" readonly></el-input>
             </el-form-item>
             <el-form-item label="当前基准油价" prop="oilpriceBase">
-              <el-input v-model="obj.oilpriceBase" readonly></el-input>
+              <el-input v-model="obj.oilpriceBase"></el-input>
             </el-form-item>
             <el-form-item label="油品名称" prop="oilTypeName">
               <el-input v-model="obj.oilTypeName" readonly></el-input>
@@ -38,8 +40,73 @@
         </el-form>
       </div>
     </div>
-
-    <div class="button-box">
+    <!-- 物资表格 -->
+    <div class="selectionTable from">
+      <el-table
+        :data="selectionList"
+        border
+        style="width: 100%"
+        highlight-current-row
+      >
+        <el-table-column type="index" label="序号" width="50">
+        </el-table-column>
+        <el-table-column
+          v-for="(item, i) in tableTop"
+          :key="i"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          align="center"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <!-- 操作列 -->
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              @click="deleteRow(scope.$index)"
+              type="text"
+              icon="el-icon-close"
+              size="big"
+            ></el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <!-- 物资模态框 -->
+    <el-drawer
+      title="请选择物资"
+      :visible.sync="drawerMaterial"
+      :direction="direction"
+      close-on-press-escape
+      modal
+      wrapperClosable
+      size="40%"
+    >
+      <div class="selectText">
+        <el-input v-model="materialText" placeholder="请输入内容"></el-input>
+        <el-button
+          type="primary"
+          @click="selectMaterial"
+          :loading="selectLineLoading"
+        ><i class="el-icon-search"></i>查询</el-button
+        >
+        <el-button type="primary" @click="addMaterialList">确定</el-button>
+      </div>
+      <div class="LineTable">
+        <vue-scroll :ops="ops" style="width:100%;height:100%">
+          <dilTable
+            v-bind.sync="materialOptions"
+            @selection-change="selectionChange"
+            :isKuang="isKuang"
+            :loading="tableLoading"
+            :drawer="oilPriceFormulaDrawer"
+            @func="func"
+          ></dilTable>
+        </vue-scroll>
+      </div>
+    </el-drawer>
+    <div class="button_box">
       <el-button type="primary" @click="onClickConfirm">修改</el-button>
       <el-button @click="onClickCancel">返回</el-button>
     </div>
@@ -47,20 +114,170 @@
 </template>
 
 <script>
+import { sjTime, isNumber } from "@/utils/sharedJsFile";
 export default {
   name: "updateTransPrice",
   data() {
     return {
+      //公式内容
+      formulaString: null,
+      oilPriceFormulaId: null,
+      rangeId: null,
+      options: [],
+      //油价联动公式模态窗口的数据
+      oilPriceFormula: {
+        requestUrl: "",
+        selectionType: "radio"
+      },
+      newsArr: [],
+      selectionList: [],
+      //是否打开油价联动公式的模态窗口
+      oilPriceFormulaDrawer: false,
+      //油价联动公式查询条件
+      LineText: null,
+      //是否点击查询
+      isKuang: false,
+      //表格加载状态
+      tableLoading: false,
+      //物资模态框默认隐藏
+      drawerMaterial: false,
+      //模态窗口的打开的方向
+      direction: "rtl",
+      //物资查询框
+      materialText: null,
+      //油价联动公式模态框查询按钮状态
+      selectLineLoading: false,
       obj: {},
+      //表单数据
+      form1: {
+        priceDate: new Date(),
+        oilTypeId: 10,
+        capacityTypeId: 1
+      },
       batchFormRules: {
-        priceValue: [{ required: true, message: '运价不能为空', trigger: 'blur' }]
+        priceValue: [{ required: true, message: '运价不能为空', trigger: 'blur' }],
+        priceDate: [{ required: true, message: '执行日期不能为空', trigger: 'blur' }],
+        oilPriceFormula: [{ required: true, message: '联动公式不能为空', trigger: 'blur' }],
+        oilpriceBase: [{ required: true, message: '油价基准不能为空', trigger: 'blur' }]
+  },
+      tableTop: [
+        {
+          prop: "materialName",
+          label: "物资名称"
+        }
+      ],
+      ops: {
+        vuescroll: {},
+        scrollPanel: {},
+        rail: {
+          keepShow: true
+        },
+        bar: {
+          hoverStyle: true,
+          onlyShowBarOnScroll: false, //是否只有滚动的时候才显示滚动条
+          background: "#5f9ea0", //滚动条颜色
+          opacity: 0.8, //滚动条透明度
+          "overflow-x": "hidden"
+        }
+      },
+      materialOptions: {
+        requestUrl: "",
+        selectionType: "select"
       }
     };
   },
   mounted() {
+    this.axios.get("/api/v1/uc/getTransRange").then(res => {
+      this.options = res.data.data;
+    });
     this.obj=this.$route.query.row;
+    // console.log("obj "+JSON.stringify(this.obj))
+    this.rangeId=this.obj.rangeId
   },
   methods: {
+    //打开线路的模态窗口
+    oilPriceFormulaClick() {
+      this.oilPriceFormulaDrawer = true;
+      this.oilPriceFormula.requestUrl = "/api/v1/uc/getOilFormula?apiId=444";
+    },
+    currentRadioChange(val) {
+      this.formulaString = val.formulaString;
+      this.oilPriceFormulaId = val.formulaId;
+    },
+    //选定联动公式确定
+    addoilPriceFormula() {
+      this.obj.oilPriceFormula=this.formulaString,
+      this.obj.cargonameId = this.oilPriceFormulaId;
+      this.obj.capacityTypeId = this.form1.capacityTypeId;
+      this.obj.priceDate=this.form1.priceDate,
+      this.obj.oilTypeId=this.form1.oilTypeId
+
+      this.oilPriceFormulaDrawer = false;
+    },
+    selectLineClick() {
+      this.tableLoading = true;
+      this.selectLineLoading = true;
+      this.isKuang = true;
+      if (this.LineText) {
+        this.oilPriceFormula.requestUrl =
+          "api/v1/uc/getOilFormula?apiId=444&con=" + this.LineText;
+      } else {
+        this.oilPriceFormula.requestUrl =
+          "api/v1/uc/getOilFormula?apiId=444&i=" + new Date();
+      }
+    },
+    //模态窗口关闭时调用
+    handleClose() {
+      if (this.oilPriceFormulaDrawer) {
+        this.oilPriceFormulaDrawer = false;
+        this.LineText = null;
+      }
+    },
+    //点击删除按钮删除当前点击的对象
+    deleteRow(index) {
+      this.selectionList.splice(index, 1);
+    },
+    func(res) {
+      this.selectLineLoading = false;
+      this.isKuang = false;
+      this.tableLoading = false;
+    },
+    selectionChange(selection) {
+      console.log(selection);
+      for (let i = 0; i < selection.length; i++) {
+        if (this.newsArr.indexOf(selection[i]) === -1) {
+          this.newsArr.push(selection[i]);
+        }
+      }
+    },
+    addMaterialList() {
+      this.drawerMaterial = false;
+      this.newsArr.forEach(e => {
+        console.log(e.materialName);
+        var addmap = {
+          materialName: e.materialTypeName,
+          materialId: e.materialTypeId
+        };
+        this.selectionList.push(addmap);
+      });
+      console.log(this.selectionList);
+      this.newsArr = [];
+    },
+    selectMaterial() {
+      if (this.materialText == null) {
+        this.materialOptions.requestUrl =
+          "/api/v1/uc/queryMaterialByLike?apiId=244&i=" + new Date();
+      } else {
+        this.materialOptions.requestUrl =
+          "/api/v1/rms/getInwardContractMaterial?apiId=482&con=" +
+          this.materialText;
+      }
+    },
+    materialDrawer() {
+      this.drawerMaterial = true;
+      this.materialOptions.requestUrl =
+        "/api/v1/rms/getInwardContractMaterial?apiId=482&i=" + new Date();
+    },
     // 返回
     onClickCancel() {
       this.$router.go(-1);
@@ -71,15 +288,23 @@ export default {
         this.$message.info("修改前请填写运价！")
           return;
       }
-
-      let paramsList = {
-        priceId: this.obj.priceId,
+      let mapValue = {
+        cargonameId: this.oilPriceFormulaId,
+        capacityTypeId: this.obj.capacityTypeId,
         priceValue: this.obj.priceValue,
+        priceDate: sjTime(this.obj.priceDate),
+        type: this.obj.type,
+        oilpriceBase: this.obj.oilpriceBase,
+        oilTypeId: this.obj.oilTypeId,
+        oilpriceChangeThreshold: this.obj.oilpriceChangeThreshold,
+        rangeId: this.rangeId,
+        mapList: this.selectionList,
+        priceId: this.obj.priceId
       };
         this.axios
           .post(
             "/api/v1/ams/updateTransPrice",
-            paramsList
+            mapValue
           )
           .then((res) => {
             if (res.data.data >=1) {
@@ -96,7 +321,7 @@ export default {
 .form {
   display: flex;
   .form_box {
-    width: 400px;
+    width: 500px;
     margin-left: 35%;
     margin-top: 30px;
     margin-right: 20px;
@@ -128,4 +353,65 @@ export default {
   text-align: right;
 };
 }
+.elForm {
+  margin-left: 30%;
+}
+.addTransportPrice {
+  .form {
+    display: flex;
+    .form_box {
+      width: 320px;
+      margin-left: 30%;
+      margin-top: 30px;
+      margin-right: 20px;
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
+              display: inline-block;
+              width: 70px !important;
+            }
+            .el-form-item__content {
+              .el-select {
+                width: 250px;
+              }
+              .el-input {
+                width: 250px;
+              }
+            }
+          }
+        }
+      }
+    }
+    .liulan {
+      width: 120px;
+      margin-top: 30px;
+      .el-button {
+        width: 100px !important;
+        margin: auto;
+      }
+      .btn {
+        margin-top: 54px;
+      }
+    }
+  }
+  .button_box {
+    margin-left: 45%;
+  }
+  .selectText {
+    .el-input {
+      width: 250px;
+    }
+  }
+  .LineTable {
+    width: 100%;
+    height: 480px;
+    overflow: hidden;
+    margin-top: 10px;
+  }
+  .btnml {
+    width: 250px;
+    margin-left: 50px;
+  }
+}
 </style>

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

@@ -1058,8 +1058,9 @@ export default {
       let day = new Date().getDate();
       let month = new Date().getMonth() + 1;
       console.log(day);
-      console.log(month);
-      console.log(`${month}.${day}`);
+      if (day < 10) {
+        day = "0" + day;
+      }
       return `${month}.${day}`;
     },
     handleSelectSaleArea(item) {

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

@@ -5,7 +5,7 @@
     <div class="form">
       <div class="form_box">
         <dil-form :formId="287" v-model="form1" ref="from1"></dil-form>
-      </div> 
+      </div>
       <div class="liulan">
           <el-button type="primary" class="btn" @click="oilPriceFormulaClick">浏览</el-button>
           <el-button type="primary" class="btn1" @click="ondrawerOut">选择</el-button>
@@ -55,7 +55,7 @@
       </div>
       <div class="LineTable">
         <vue-scroll :ops="ops" style="width:100%;height:100%">
-          <dilTable 
+          <dilTable
             v-bind.sync="oilPriceFormula"
             @radio-change="currentRadioChange"
             :isKuang="isKuang"
@@ -172,6 +172,7 @@ export default {
         priceDate:new Date(),
         oilTypeId:10,
         capacityTypeId:1,
+        type: "销售钢材"
       },
       //提交给后端的数据
       // map:{},
@@ -318,7 +319,7 @@ export default {
       };
     },
     //以上是收货地址边输边查搜索
-    
+
     //选定联动公式确定
     addoilPriceFormula(){
       let mapvalue = {
@@ -394,7 +395,7 @@ export default {
             type: "success",
             message: "新增运输单价成功!",
           });
-        });   
+        });
     },
     // 取消
     cancel() {
@@ -447,13 +448,14 @@ export default {
       margin-top: 30px;
       .el-button{
         width: 100px !important;
-        margin: auto;
+        //margin: auto;
       }
       .btn{
-        margin-top: 105px;
+        margin-top: 110px;
       }
       .btn1{
         margin-top: 13px;
+        margin-left: 0px;
       }
       .btn2{
         margin-top: 67px;
@@ -483,4 +485,4 @@ export default {
   /deep/.__bar-is-horizontal {
     display: none !important;
   }
-</style>
+</style>

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

@@ -139,7 +139,7 @@
       </el-form-item>
       <el-form-item>
         <label class="el-form-item__label" style="width: auto;"
-        >可装货时间</label
+          >可装货时间</label
         >
         <el-date-picker
           class="textinput3"
@@ -183,7 +183,7 @@
                   class="textinput111"
                   v-model.number="scope.row.orderPlanWeight"
                   placeholder="(必填)"
-                  :id="'input'+scope.$index"
+                  :id="'input' + scope.$index"
                   @keyup.up.native="clicks(scope.$index)"
                   @keyup.down.native="clickx(scope.$index)"
                   @keyup.enter.native="createACar"
@@ -313,10 +313,12 @@
                 >
                 </el-input>
                 <!--更改-->
-                <i class="el-icon-edit"
-                   @click="changeMaterial(scope.$index)"
-                   style="font-size: 20px"
-                   v-if="isCellClick == 1"></i>
+                <i
+                  class="el-icon-edit"
+                  @click="changeMaterial(scope.$index)"
+                  style="font-size: 20px"
+                  v-if="isCellClick == 1"
+                ></i>
               </template>
               <!-- 物资件数 -->
               <template v-if="item.prop == 'orderPlanWeight'">
@@ -326,7 +328,7 @@
                 ></el-input>
               </template>
               <!--规格型号-->
-              <template v-if="item.prop=='Specification'">
+              <template v-if="item.prop == 'Specification'">
                 <el-input
                   class="textinput"
                   v-model.number="scope.row.Specification"
@@ -370,10 +372,11 @@
                 >
                 </el-input>
                 <!--增加-->
-                <i class="el-icon-folder-add"
-                   @click="ondrawer(scope.row, scope.$index)"
-                   v-if="isCellClick == 1"
-                   style="font-size: 20px"
+                <i
+                  class="el-icon-folder-add"
+                  @click="ondrawer(scope.row, scope.$index)"
+                  v-if="isCellClick == 1"
+                  style="font-size: 20px"
                 ></i>
               </template>
               <!-- 收货客户电话号码 -->
@@ -400,8 +403,12 @@
           </template>
         </el-table-column>
         <!-- 操作列 -->
-        <el-table-column fixed="right" label="操作" width="200"
-                         v-if="isCellClick == 1">
+        <el-table-column
+          fixed="right"
+          label="操作"
+          width="200"
+          v-if="isCellClick == 1"
+        >
           <template slot-scope="scope">
             <el-button
               @click.native.prevent="deleteRow(scope.$index, selectionList)"
@@ -717,7 +724,7 @@ export default {
         {
           prop: "Specification",
           label: "规格型号",
-          width: "140",
+          width: "140"
         },
         {
           prop: "orderPlanWeight",
@@ -826,6 +833,14 @@ export default {
         {
           values1: "dgsm",
           label1: "四川达钢商贸有限公司"
+        },
+        {
+          values1: "jxjl",
+          label1: "江西久隆贸易有限公司"
+        },
+        {
+          values1: "hnht",
+          label1: "海南瀚途贸易有限公司"
         }
       ],
       values1: "dzgt",
@@ -913,7 +928,7 @@ export default {
       //是否忽视收货客户电话字段
       ignoreSaleOrderConsigneeTel: 0,
       //暂时存取的数据
-      temporarylist: [],
+      temporarylist: []
     };
   },
   created() {
@@ -1833,15 +1848,15 @@ export default {
     addAddressClick() {
       //不管是外层还是内层都需要修改，如果存在都需要修改收货客户的电话
       //定义一个正则表达式判断是否有电话
-      var est=/\d{11}/g
-      var string2=this.place.match(est)
-      console.log("-----------这是抓取到的数据----------")
-      console.log(string2)
-      if (string2 != null){
-        for(i=0;i<string2.length;i++){
-          var reg=/^1[3456789]\d{9}$/
-          if(reg.test(string2[i])){
-            this.saleOrderConsigneeTel=string2
+      var est = /\d{11}/g;
+      var string2 = this.place.match(est);
+      console.log("-----------这是抓取到的数据----------");
+      console.log(string2);
+      if (string2 != null) {
+        for (i = 0; i < string2.length; i++) {
+          var reg = /^1[3456789]\d{9}$/;
+          if (reg.test(string2[i])) {
+            this.saleOrderConsigneeTel = string2;
           }
         }
       }
@@ -1914,17 +1929,17 @@ export default {
           i++;
         }
       });
-      let s=0
+      let s = 0;
       //确认规格型号格式是否正确
       await this.axios
-        .post("/api/v1/ams/queryFormat",this.selectionList)
-        .then(res=>{
-          if (res.data.code=="500"){
-            s=1
+        .post("/api/v1/ams/queryFormat", this.selectionList)
+        .then(res => {
+          if (res.data.code == "500") {
+            s = 1;
           }
-        })
-      console.log("这是获取到的数据")
-      if (s== 1){
+        });
+      console.log("这是获取到的数据");
+      if (s == 1) {
         this.$message.error("规格型号有问题，请重新输入");
         return;
       }
@@ -1963,36 +1978,38 @@ export default {
       });
       this.orderMakeSure = true;
     },
-    async getlist(){
-      let res=await this.axios
-        .post("/api/v1/ams/queryMaterial",this.selectionList)
-      this.selectionList=res.data.data
-      console.log("这是查询出来的")
-      console.log(res.data.data)
-      console.log("这是修改后的数据")
-      console.log(this.selectionList)
+    async getlist() {
+      let res = await this.axios.post(
+        "/api/v1/ams/queryMaterial",
+        this.selectionList
+      );
+      this.selectionList = res.data.data;
+      console.log("这是查询出来的");
+      console.log(res.data.data);
+      console.log("这是修改后的数据");
+      console.log(this.selectionList);
     },
     //发送请求
     async sendRequest() {
       //根据规格型号与物资名称获取对应的物资ID||确认规格型号格式是否正确
       //先把暂存区的数据清空
-      this.temporarylist=[]
-      let flag=0
+      this.temporarylist = [];
+      let flag = 0;
       await this.axios
-        .post("/api/v1/ams/queryMaterial",this.selectionList)
-        .then(res=>{
-          if (res.data.code === "500"){
-            flag=1
+        .post("/api/v1/ams/queryMaterial", this.selectionList)
+        .then(res => {
+          if (res.data.code === "500") {
+            flag = 1;
           }
-          console.log(res.data.code)
+          console.log(res.data.code);
           //给暂存区的数据赋值
-          this.temporarylist=res.data.data
-          console.log("以下是查询出来的数据")
-          console.log(res.data.data)
-        })
-      if (flag===1){
-        this.$message.error("规格型号不对")
-        return
+          this.temporarylist = res.data.data;
+          console.log("以下是查询出来的数据");
+          console.log(res.data.data);
+        });
+      if (flag === 1) {
+        this.$message.error("规格型号不对");
+        return;
       }
       //先调删除订单接口
       this.axios
@@ -2006,9 +2023,9 @@ export default {
             //是否还有件数未填写
             var orderPlanWeightAllFill = 0;
             //初始化maplist
-            this.selectionList=this.temporarylist
-            console.log("以下是修改过后的数据")
-            console.log(this.selectionList)
+            this.selectionList = this.temporarylist;
+            console.log("以下是修改过后的数据");
+            console.log(this.selectionList);
             var mapList = [];
             this.selectionList.forEach(item => {
               if (!item.orderPlanWeight) {
@@ -2089,32 +2106,33 @@ export default {
     },
     CloseClick() {},
     //点击事件（上）
-    clicks(index){
-      console.log(index)
-      console.log(this.materialList)
-      console.log(this.materialList.length-1)
-      console.log('clicks=e',arguments);
-      if (index==0){
-        console.log("向上1")
+    clicks(index) {
+      console.log(index);
+      console.log(this.materialList);
+      console.log(this.materialList.length - 1);
+      console.log("clicks=e", arguments);
+      if (index == 0) {
+        console.log("向上1");
         //this.datalistindex=this.materialTableTop.length-1
-        document.getElementById("input" + (this.materialList.length-1)).focus()
-      }else {
-        console.log("向上2")
+        document
+          .getElementById("input" + (this.materialList.length - 1))
+          .focus();
+      } else {
+        console.log("向上2");
         //this.$refs.materialTableTop.bodyWrapper.scrollTop=index
-        document.getElementById("input" + (index-1)).focus()
+        document.getElementById("input" + (index - 1)).focus();
       }
-
     },
     //点击事件(下)
-    clickx(index){
-      console.log(index)
-      console.log(this.materialList)
-      console.log(this.materialList.length-1)
-      if (index ==this.materialList.length-1){
-        console.log("向下1")
-        document.getElementById("input" + 0).focus()
-      }else {
-        console.log("向下2")
+    clickx(index) {
+      console.log(index);
+      console.log(this.materialList);
+      console.log(this.materialList.length - 1);
+      if (index == this.materialList.length - 1) {
+        console.log("向下1");
+        document.getElementById("input" + 0).focus();
+      } else {
+        console.log("向下2");
         //this.datalistindex+=1
         //this.$refs.materialTableTop.bodyWrapper.scrollTop=(index+1)*height
         //var tbl=document.getElementById("table").childNodes[0]
@@ -2123,7 +2141,7 @@ export default {
         //.children[1].children[len].children[3].children[0].children[0].children[0].focus()
         //console.log(rowlist)
         var nextInput = document.getElementById("input" + (index + 1));
-        nextInput.focus()
+        nextInput.focus();
       }
     }
   }

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -137,7 +137,8 @@
             </el-table-column>
             <el-table-column label="装货点" width="100">
               <template slot-scope="scope">
-                <el-select size="mini" v-model="scope.row.id">
+                <el-select size="mini" v-model="scope.row.id"
+                @change="changePriority($event,scope.row.id)">
                   <el-option
                     v-for="item in option"
                     :key="item.id"
@@ -245,10 +246,8 @@
         <el-tab-pane label="仓库排队列表" name="third">
           <el-table
             :data="tableData3"
-            :span-method="objectSpanMethod"
             border
             style="width: 100%; margin-top: 20px"
-            @selection-change="handleSelectionChange"
             max-height="500px"
           >
             <el-table-column prop="warehouseName" label="仓库" fit></el-table-column>
@@ -310,6 +309,7 @@ export default {
     this.infomation();
     this.getSpellingArray();
     this.getNoSpellingArray();
+    this.getStoreArray();
     this.getSteelOrderNum();
     this.wantEnfactory();
     this.start();
@@ -363,6 +363,7 @@ export default {
       this.getSpellingArray();
       this.getNoSpellingArray();
       this.getSteelOrderNum();
+      this.getStoreArray();
       this.redDotNum = null;
       this.totalQueueNum = null;
       this.totalQueueNumFirst = null;
@@ -537,7 +538,7 @@ export default {
         )
         .then(res => {
           this.tableData3 = res.data.data;
-          console.log("getStoreArray "+this.tableData3);
+          console.log("getStoreArray "+JSON.stringify(this.tableData3));
         });
     },
     onclick() {
@@ -634,6 +635,7 @@ export default {
           this.$refs.mutiData.clearSelection();
           this.getNoSpellingArray();
           this.getSpellingArray();
+          this.getStoreArray();
           this.redDotNum = null;
           this.totalQueueNum = null;
           this.totalQueueNumFirst = null;
@@ -646,6 +648,7 @@ export default {
           this.$refs.mutiData.clearSelection();
           this.getNoSpellingArray();
           this.getSpellingArray();
+          this.getStoreArray();
           this.redDotNum = null;
           this.totalQueueNum = null;
           this.totalQueueNumFirst = null;
@@ -654,6 +657,11 @@ export default {
           this.start();
         }
       });
+    },
+    changePriority(value,s){
+      console.log("装货点："+value)
+      console.log("数据第几行:"+s)
+      //this.axios.post("")
     }
   }
 };

src/views/sale/components/offSiteTransportation/transportationPerformance.vue

@@ -4,37 +4,42 @@
     <el-form :inline="true">
       <el-form-item>
         <label class="el-form-item__label" style="width: auto;">时间段</label>
-            <el-date-picker
+        <el-date-picker
           v-model="dateValue"
           type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
-          end-placeholder="结束日期">
+          end-placeholder="结束日期"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item>
         <span class="el-form-item__span" style="width: auto;">产品分类</span>
-          <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
+        <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
       </el-form-item>
       <el-form-item>
-          <span class="el-form-item__span" style="width: auto;">车牌号</span>
-          <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
+        <span class="el-form-item__span" style="width: auto;">车牌号</span>
+        <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
       </el-form-item>
       <el-form-item>
-          <span class="el-form-item__span" style="width: auto;">收货单位</span>
-          <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
-      </el-form-item> 
+        <span class="el-form-item__span" style="width: auto;">收货单位</span>
+        <el-input
+          v-model="consigneeCompanyName1"
+          placeholder="请输入内容"
+        ></el-input>
+      </el-form-item>
       <el-form-item>
-          <span class="el-form-item__span" style="width: auto;">承运单位</span>
-          <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
-      </el-form-item> 
+        <span class="el-form-item__span" style="width: auto;">承运单位</span>
+        <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
+      </el-form-item>
       <el-form-item>
         <span class="el-form-item__span" style="width: auto;">门岗名称</span>
         <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
-      </el-form-item> 
+      </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="onSearch"><i class="el-icon-search"></i>查询</el-button>
-      
+        <el-button type="primary" @click="onSearch"
+          ><i class="el-icon-search"></i>查询</el-button
+        >
       </el-form-item>
     </el-form>
     <!-- 执行中 -->
@@ -42,21 +47,39 @@
     <mergeRowTable ref="tab" v-bind.sync="option">
       <el-table-column fixed="right" label="操作" width="180">
         <template slot-scope="scope">
-          <el-button @click="click(scope.row)" type="text" size="small" style="font-size: 17px">轨迹</el-button>
-          <el-button @click="toPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 17px">抵达图</el-button>
-          <el-button @click="receipctPhotoClick(scope.row.orderNumber)" type="text" size="small" style="font-size: 17px">签收图</el-button>
+          <el-button
+            @click="click(scope.row)"
+            type="text"
+            size="small"
+            style="font-size: 17px"
+            >轨迹</el-button
+          >
+          <el-button
+            @click="toPhotoClick(scope.row.orderNumber)"
+            type="text"
+            size="small"
+            style="font-size: 17px"
+            >抵达图</el-button
+          >
+          <el-button
+            @click="receipctPhotoClick(scope.row.orderNumber)"
+            type="text"
+            size="small"
+            style="font-size: 17px"
+            >签收图</el-button
+          >
         </template>
       </el-table-column>
     </mergeRowTable>
 
     <div style="height: 100%">
       <vxe-modal width="1237" height="731" v-model="value7" show-zoom resize>
-            <template #default>
-              <PathView v-bind.sync="pathOption"></PathView>
-            </template>
+        <template #default>
+          <PathView v-bind.sync="pathOption"></PathView>
+        </template>
       </vxe-modal>
     </div>
-     <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
+    <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
       <div class="demo-image__preview">
         <el-image
           style=" height:731px;text-align:center;"
@@ -66,7 +89,7 @@
         </el-image>
       </div>
     </vxe-modal>
-     <vxe-modal width="549px" height="731px" v-model="isShow2" show-footer>
+    <vxe-modal width="549px" height="731px" v-model="isShow2" show-footer>
       <div class="demo-image__preview">
         <el-image
           style=" height:731px;text-align:center"
@@ -82,87 +105,85 @@
           <dilTable ref="tableAlarm" v-bind.sync="optionAlarm"></dilTable>
         </template>
       </vxe-modal>
-    </div> 
+    </div>
   </div>
 </template>
 
-
 <script>
 import { sjTime } from "@/utils/sharedJsFile";
-import PathView from "./mapTest.vue"
+import PathView from "./mapTest.vue";
 export default {
   name: "inTransit",
-  components: { 
-    PathView,
+  components: {
+    PathView
   },
   data() {
     return {
-      dateValue:[new Date(), new Date()],
-      inputValue:"",
-      exceptionType:"全部类型",
-      selectOrderNumber:"",
-      capacityNumber1:"",
-      carrierName:"",
-       gatepostName:"",
-       value7:false,
-       value6:false,
-       value5:false,
-       dialogVisible:false,
-      consigneeCompanyName1:"",
+      dateValue: [new Date(), new Date()],
+      inputValue: "",
+      exceptionType: "全部类型",
+      selectOrderNumber: "",
+      capacityNumber1: "",
+      carrierName: "",
+      gatepostName: "",
+      value7: false,
+      value6: false,
+      value5: false,
+      dialogVisible: false,
+      consigneeCompanyName1: "",
       status: "",
       state: "",
       activeName: "first",
-      option: {       
+      option: {
         // 表格请求数据的地址
         requestUrl: "/api/v1/otms/transportationPerformance?apiId=479",
-        comparison:"orderNumber",
-        columnIndexs:[1,2,8,9,10,11,12,13,14,15,16,17,18,19],  
+        comparison: "orderNumber",
+        columnIndexs: [1, 2, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
       },
-      
-      optionAlarm:{
-        requestUrl: "",
+
+      optionAlarm: {
+        requestUrl: ""
       },
-      pathOption:{
-           orderNumber:'',
-        capacityNumber:'',
-         startPointName:'',
-        endPointName:'',
+      pathOption: {
+        orderNumber: "",
+        capacityNumber: "",
+        startPointName: "",
+        endPointName: ""
       },
-      mileOption:{
-        orderNumber:''
+      mileOption: {
+        orderNumber: ""
       },
-      alarmOption:{
-        orderNumber:''
+      alarmOption: {
+        orderNumber: ""
       },
       srcList: [],
       src: "",
-      isShow:false,
+      isShow: false,
       srcList2: [],
       src2: "",
-      isShow2:false,
+      isShow2: false
     };
   },
   mounted() {
-    console.log("nijfdsojfosafj")
+    console.log("nijfdsojfosafj");
     this.restaurants = this.loadAll();
     // this.onSearch();
-    
   },
   methods: {
-    receipctPhotoClick(orderNumber){
-      this.axios
-       .post("/api/v1/otms/getReceivingPhotoByUrl?orderNumber="+orderNumber)
-       .then((res)=>{
-         console.log(res.data)
-          this.isShow2=true;
-          this.srcList2=[];
-          this.src2=res.data.resultSignedNotePhoto;
+    receipctPhotoClick(orderNumber) {
+      this.axios
+        .post("/api/v1/otms/getReceivingPhotoByUrl?orderNumber=" + orderNumber)
+        .then(res => {
+          console.log(res.data);
+          this.isShow2 = true;
+          this.srcList2 = [];
+          this.src2 = res.data.resultSignedNotePhoto;
           this.srcList2.push(res.data.resultSignedNotePhoto);
-          this.srcList2.push(res.data.resultEmptyContainerPhoto);
-          if(res.data.resultReceiveNotePhoto!=null){
-             this.srcList2.push(res.data.resultReceiveNotePhoto);
+          this.srcList2.push(res.data.resultEmptyContainerPhoto);
+          if (res.data.resultReceiveNotePhoto != null) {
+            this.srcList2.push(res.data.resultReceiveNotePhoto);
           }
-       });
+        });
     },
     toPhotoClick(orderNumber) {
       this.axios
@@ -174,14 +195,14 @@ export default {
           this.srcList.push(res.data.data);
         });
     },
-   
-    showPathView(data){
-      this.dialogVisible=!this.dialogVisible;
-      this.selectOrderNumber=data.orderNumber;
+
+    showPathView(data) {
+      this.dialogVisible = !this.dialogVisible;
+      this.selectOrderNumber = data.orderNumber;
     },
- 
+
     createFilter(queryString) {
-      return (restaurant) => {
+      return restaurant => {
         return (
           restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) ===
           0
@@ -190,45 +211,59 @@ export default {
     },
     loadAll() {
       return [
-        { value: "螺纹钢"},
-         { value: "微粉"},
-        { value: "带钢"},
-        { value: "钢坯"},
-        { value: "其他"},
+        { value: "螺纹钢" },
+        { value: "微粉" },
+        { value: "带钢" },
+        { value: "钢坯" },
+        { value: "其他" }
       ];
     },
-    exportData(){
-        
-        let tHeader = [];
-        let filterVal = [];
-        if(this.activeName=="first"){
-          this.$refs.tab.dataColumnData.filter( (item,i) =>{
-                    tHeader.push(item.label);
-                        filterVal.push(item.prop);
-                    } )
-            this.export2Excel(tHeader,filterVal,this.$refs.tab.dataTabel,'执行中表格');
-        }else if(this.activeName=="second"){
-            this.$refs.tab2.dataColumnData.filter( (item,i) =>{
-              tHeader.push(item.label);
-                  filterVal.push(item.prop);
-              } )
-          this.export2Excel(tHeader,filterVal,this.$refs.tab2.dataTabel,'已完成表格');
-        } else if(this.activeName=="third"){
-            this.$refs.tab3.dataColumnData.filter( (item,i) =>{
-                      tHeader.push(item.label);
-                          filterVal.push(item.prop);
-                      } )
-            this.export2Excel(tHeader,filterVal,this.$refs.tab3.dataTabel,'有异常表格');
-        }
-        
-        
+    exportData() {
+      let tHeader = [];
+      let filterVal = [];
+      if (this.activeName == "first") {
+        this.$refs.tab.dataColumnData.filter((item, i) => {
+          tHeader.push(item.label);
+          filterVal.push(item.prop);
+        });
+        this.export2Excel(
+          tHeader,
+          filterVal,
+          this.$refs.tab.dataTabel,
+          "执行中表格"
+        );
+      } else if (this.activeName == "second") {
+        this.$refs.tab2.dataColumnData.filter((item, i) => {
+          tHeader.push(item.label);
+          filterVal.push(item.prop);
+        });
+        this.export2Excel(
+          tHeader,
+          filterVal,
+          this.$refs.tab2.dataTabel,
+          "已完成表格"
+        );
+      } else if (this.activeName == "third") {
+        this.$refs.tab3.dataColumnData.filter((item, i) => {
+          tHeader.push(item.label);
+          filterVal.push(item.prop);
+        });
+        this.export2Excel(
+          tHeader,
+          filterVal,
+          this.$refs.tab3.dataTabel,
+          "有异常表格"
+        );
+      }
     },
-    export2Excel(tHeader,filterVal,dataTabel,exeName) {
+    export2Excel(tHeader, filterVal, dataTabel, exeName) {
       var that = this;
-       this.downloadLoading = true
+      this.downloadLoading = true;
       require.ensure([], () => {
-        const { export_json_to_excel } = require("@/assets/excel/Export2Excel.js"); //这里必须使用绝对路径，使用@/+存放export2Excel的路径
-        console.log("export_json_to_excel",export_json_to_excel)
+        const {
+          export_json_to_excel
+        } = require("@/assets/excel/Export2Excel.js"); //这里必须使用绝对路径，使用@/+存放export2Excel的路径
+        console.log("export_json_to_excel", export_json_to_excel);
         let list = dataTabel;
         let data = that.formatJson(filterVal, list);
         export_json_to_excel(tHeader, data, exeName); // 导出的表格名称
@@ -236,100 +271,106 @@ export default {
     },
     //3.格式转换
     formatJson(filterVal, jsonData) {
-      return jsonData.map((v) => filterVal.map((j) => v[j]));
+      return jsonData.map(v => filterVal.map(j => v[j]));
     },
-    onSearch(){
-  
-      if(this.activeName=="first"){
-      //改变执行中条件
-      console.log(this.$refs.tab)
-      console.log("this.$refs.tab")
-      this.$refs.tab.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
-                      "endTime": sjTime(this.dateValue[1]),
-                      "materialNames": this.inputValue,
-                      "capacityNumbers": this.capacityNumber1,
-                      "carrierNames":this.carrierName,
-                      "outGatepostNames":this.gatepostName,
-                      "receiveNames": this.consigneeCompanyName1});
+    onSearch() {
+      if (this.activeName == "first") {
+        //改变执行中条件
+        console.log(this.$refs.tab);
+        console.log("this.$refs.tab");
+        this.$refs.tab.setDataRequestQuery({
+          startTime: sjTime(this.dateValue[0]),
+          endTime: sjTime(this.dateValue[1]),
+          materialNames: this.inputValue,
+          capacityNumbers: this.capacityNumber1,
+          carrierNames: this.carrierName,
+          outGatepostNames: this.gatepostName,
+          receiveNames: this.consigneeCompanyName1
+        });
+      }
+      if (this.activeName == "second") {
+        //改变已完成条件
+        this.$refs.tab2.setDataRequestQuery({
+          startTime: sjTime(this.dateValue[0]),
+          endTime: sjTime(this.dateValue[1]),
+          materialNames: this.inputValue,
+          capacityNumbers: this.capacityNumber1,
+          carrierNames: this.carrierName,
+          outGatepostNames: this.gatepostName,
+          receiveNames: this.consigneeCompanyName1
+        });
       }
-      if(this.activeName=="second"){
-      //改变已完成条件              
-      this.$refs.tab2.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
-                      "endTime": sjTime(this.dateValue[1]),
-                      "materialNames": this.inputValue,
-                      "capacityNumbers": this.capacityNumber1,
-                      "carrierNames":this.carrierName,
-                      "outGatepostNames":this.gatepostName,
-                      "receiveNames": this.consigneeCompanyName1});
+      if (this.activeName == "third") {
+        //改变有异常条件
+        this.$refs.tab3.setDataRequestQuery({
+          startTime: sjTime(this.dateValue[0]),
+          endTime: sjTime(this.dateValue[1]),
+          materialNames: this.inputValue,
+          capacityNumber1: this.capacityNumber1,
+          carrierName1: this.carrierName,
+          abnormalType:
+            this.exceptionType == "全部类型" ? "" : this.exceptionType,
+          outGatepostNames: this.gatepostName,
+          receiveNames: this.consigneeCompanyName1
+        });
       }
-      if(this.activeName=="third"){
-      //改变有异常条件              
-      this.$refs.tab3.setDataRequestQuery({"startTime":sjTime(this.dateValue[0]),
-                      "endTime": sjTime(this.dateValue[1]),
-                      "materialNames": this.inputValue,
-                      "capacityNumber1": this.capacityNumber1,
-                      "carrierName1":this.carrierName,
-                      "abnormalType":this.exceptionType=="全部类型"?"":this.exceptionType,
-                      "outGatepostNames":this.gatepostName,
-                      "receiveNames": this.consigneeCompanyName1});
-      }                              
     },
 
-
     //other
     click(row) {
-        let that = this;
-        that.axios
-          .post("/api/v1/otms/fullPath?orderNumber=" + row.orderNumber)
-          .then(res => {
-            console.log(res.data);
-            if (res.data.data == "-1") {
-              this.$message.error("运输订单未关闭的自提车辆无权查看!");
-            } else if (res.data.data.startAndEndRoutes != null) {
-              that.pathOption.orderNumber=row.orderNumber;
-              that.pathOption.capacityNumber=row.capacityNumber;
-              that.pathOption.startPointName="达钢集团"+row.outGatepostName,
-              that.pathOption.endPointName=row.deliveryAddress,
-              that.value7=true;
-            } else {
-              this.$message.error("车辆没有开启GPS");
-            }
-          });
+      let that = this;
+      that.axios
+        .post("/api/v1/otms/fullPath?orderNumber=" + row.orderNumber)
+        .then(res => {
+          console.log(res.data);
+          if (res.data.data == "-1") {
+            this.$message.error("运输订单未关闭的自提车辆无权查看!");
+          } else if (res.data.data.startAndEndRoutes != null) {
+            that.pathOption.orderNumber = row.orderNumber;
+            that.pathOption.capacityNumber = row.capacityNumber;
+            (that.pathOption.startPointName = "达钢集团" + row.outGatepostName),
+              (that.pathOption.endPointName = row.deliveryAddress),
+              (that.value7 = true);
+          } else {
+            this.$message.error("车辆没有开启GPS");
+          }
+        });
     },
-    historyclick(row){
-      
-      this.pathOption.orderNumber=row.orderNumber;
-        this.pathOption.capacityNumber=row.capacityNumber;
-        this.pathOption.startPointName="达钢集团"+row.outGatepostName,
-        this.pathOption.endPointName=row.deliveryAddress,
-         console.log(this.pathOption,"this.pathOption")
-        this.value7=true;
+    historyclick(row) {
+      this.pathOption.orderNumber = row.orderNumber;
+      this.pathOption.capacityNumber = row.capacityNumber;
+      (this.pathOption.startPointName = "达钢集团" + row.outGatepostName),
+        (this.pathOption.endPointName = row.deliveryAddress),
+        console.log(this.pathOption, "this.pathOption");
+      this.value7 = true;
     },
-    allDistanceclick(orderNumber){
+    allDistanceclick(orderNumber) {
       //this.$router.push("/offsite/inTransitOrderMileage?orderNumber="+orderNumber);
-    
-      this.mileOption.orderNumber=orderNumber;
-      this.value6=true;
-    },
-    inTransitAlarmclick(orderNumber){
-      this.optionAlarm.requestUrl="/api/v1/otms/getTransportAbnormalInfo?apiId=472&orderNumbers="+orderNumber;
-      this.value5=true;
-    },
+
+      this.mileOption.orderNumber = orderNumber;
+      this.value6 = true;
     },
+    inTransitAlarmclick(orderNumber) {
+      this.optionAlarm.requestUrl =
+        "/api/v1/otms/getTransportAbnormalInfo?apiId=472&orderNumbers=" +
+        orderNumber;
+      this.value5 = true;
+    }
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .el-input {
-    width: 150px;
-    margin-left: 5px;
+  width: 150px;
+  margin-left: 5px;
 }
 span.el-form-item__span {
-    float: left;
-    margin-top: 7px;
+  float: left;
+  margin-top: 7px;
 }
 .homeworkPath {
   .top {
     padding: 20px 30px;
   }
 }
-</style>
+</style>

src/views/sale/components/saleSelfMachine/printReceipt.vue

@@ -51,8 +51,8 @@
               <th style="width: 23.5%; text-align: center">物资名称</th>
               <th style="width: 22.5%; text-align: center">规格型号</th>
               <th style="width: 14%">件数</th>
-              <th style="width: 14%">重量</th>
-              <th style="width: 21%">订单日期</th>
+              <th style="width: 35%">重量</th>
+<!--              <th style="width: 21%">订单日期</th>-->
             </tr>
             <tr v-for="(item, index) in deliveryOrderMaterialList" :key="index">
               <td>{{ index + 1 }}</td>
@@ -60,7 +60,7 @@
               <td>{{ item.materialSpe }}{{ item.materialModel }}</td>
               <td>{{ item.materialNumber }}</td>
               <td>{{ item.materialWeight }}</td>
-              <td>{{ item.makeDate }}</td>
+<!--              <td>{{ item.makeDate }}</td>-->
             </tr>
           </table>
 

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckSteelDetails.vue

@@ -57,11 +57,6 @@
       </el-tabs>
     </div>
     <!-- 修改详单单价弹出框 -->
-    <el-dialog
-      title="修改详单地址"
-      :visible.sync="dialogFormVisible"
-      append-to-body
-    >
       <!-- 内层单价选择弹出框 -->
 <!--      <el-dialog
         width="40%"
@@ -125,9 +120,15 @@
       </el-dialog>-->
       <!-- 内层单价选择弹出框 -->
 
-      <el-form>
-        <el-form-item label="原详单地址" :label-width="formLabelWidth">
-          <el-input
+      <!--append-to-body-->
+      <el-drawer
+        title="修改详单地址"
+        :visible.sync="dialogFormVisible"
+        size="40%"
+        >
+<!--        <el-form-item label="原详单地址" :label-width="formLabelWidth">-->
+        原详单地址
+        <el-input
             style="width:250px"
             v-model="originalAddress"
             disabled
@@ -138,7 +139,8 @@
             v-model="originalPriceValue"
             disabled
           ></el-input>
-        </el-form-item>
+<!--        </el-form-item>-->
+        <!---->
         <el-input
           v-model="addresText"
           placeholder="请输入内容"
@@ -174,12 +176,14 @@
             >浏览</el-button
           >
         </el-form-item>-->
-      </el-form>
-      <div slot="footer" class="dialog-footer">
+
+        <!-- class="dialog-footer" slot="footer"-->
+      <div class="opreation">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
         <el-button type="primary" @click="makeSure">确 定</el-button>
       </div>
-    </el-dialog>
+
+      </el-drawer>
     <!-- 增加途损 -->
     <el-dialog title="增加途损" width="30%" :visible.sync="dialogDamage">
       <el-form>
@@ -199,6 +203,7 @@
       </div>
     </el-dialog>
   </div>
+
 </template>
 
 <script>
@@ -558,4 +563,8 @@ export default {
     }
   }
 }
+.opreation{
+  width: 300px;
+  height: 200px;
+}
 </style>

src/views/statisticalReport/app.js

@@ -26,6 +26,11 @@ Vue.use(tableToExcel);
 import htmlToPdf from "@/components/exportPdfs/exportPdfs";
 Vue.use(htmlToPdf);
 //导出PDF组件
+import "xe-utils";
+import VXETable from "vxe-table";
+import "vxe-table/lib/style.css";
+Vue.use(VXETable);
+Vue.prototype.$XModal = VXETable.modal;
 
 // 关闭生产模式下给出的提示
 Vue.config.productionTip = false;

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

@@ -228,6 +228,16 @@
           width="280px"
           show-overflow-tooltip
         >
+          <template slot-scope="scope">
+            <el-input style="width:150px" v-model="scope.row.arrivalAddress">
+            </el-input>
+            <el-button
+              v-if="scope.row.arrivalAddress != null"
+              @click="toPhotoClick(scope.row.orderNo)"
+              type="primary"
+              >查看抵达图</el-button
+            >
+          </template>
         </el-table-column>
         <el-table-column
           prop="receiptAddress"
@@ -235,6 +245,16 @@
           width="280px"
           show-overflow-tooltip
         >
+          <template slot-scope="scope">
+            <el-input style="width:150px" v-model="scope.row.arrivalAddress">
+            </el-input>
+            <el-button
+              v-if="scope.row.arrivalAddress != null"
+              @click="receipctPhotoClick(scope.row.orderNo)"
+              type="primary"
+              >查看签收图</el-button
+            >
+          </template>
         </el-table-column>
         <el-table-column
           prop="orderNo"
@@ -263,6 +283,11 @@
             >
           </template>
         </el-table-column>
+        <el-table-column
+          prop="isPrintDelivery"
+          label="送货单打印状态"
+          align="center"
+        ></el-table-column>
         <el-table-column prop="saler" label="业务员" align="center">
         </el-table-column>
         <el-table-column
@@ -339,6 +364,28 @@
         </el-table-column>
       </el-table>
     </div>
+    <div>
+      <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
+        <div class="demo-image__preview">
+          <el-image
+            style=" height:731px;text-align:center;"
+            :src="src"
+            :preview-src-list="srcList"
+          >
+          </el-image>
+        </div>
+      </vxe-modal>
+      <vxe-modal width="549px" height="731px" v-model="isShow2" show-footer>
+        <div class="demo-image__preview">
+          <el-image
+            style=" height:731px;text-align:center"
+            :src="src2"
+            :preview-src-list="srcList2"
+          >
+          </el-image>
+        </div>
+      </vxe-modal>
+    </div>
     <div class="address">
       <!-- 收货地址弹出框 -->
       <el-dialog title="收货地址" :visible.sync="drawer" width="90%">
@@ -534,7 +581,13 @@ export default {
       //省市县Id
       addressId: null,
       addressRow: {},
-      operateShow: 0
+      operateShow: 0,
+      srcList: [],
+      src: "",
+      isShow: false,
+      srcList2: [],
+      src2: "",
+      isShow2: false
     };
   },
   created() {},
@@ -542,6 +595,33 @@ export default {
     this.getSteelReport();
   },
   methods: {
+    //查看抵达图
+    toPhotoClick(orderNo) {
+      this.axios
+        .post("/api/v1/otms/getArrivalPhoto?orderNumber=" + orderNo)
+        .then(res => {
+          this.srcList = [];
+          this.src = res.data.data;
+          this.isShow = true;
+          this.srcList.push(res.data.data);
+        });
+    },
+    //查看签收图
+    receipctPhotoClick(orderNo) {
+      this.axios
+        .post("/api/v1/otms/getReceivingPhotoByUrl?orderNumber=" + orderNo)
+        .then(res => {
+          console.log(res.data);
+          this.isShow2 = true;
+          this.srcList2 = [];
+          this.src2 = res.data.resultSignedNotePhoto;
+          this.srcList2.push(res.data.resultSignedNotePhoto);
+          this.srcList2.push(res.data.resultEmptyContainerPhoto);
+          if (res.data.resultReceiveNotePhoto != null) {
+            this.srcList2.push(res.data.resultReceiveNotePhoto);
+          }
+        });
+    },
     rowClick() {
       if (this.operateShow == 1) {
         this.operateShow = 0;
@@ -553,8 +633,8 @@ export default {
     adverseCloseSaleMaterial(row) {
       console.log(row.saleMaterialId);
       this.$confirm("确定反关闭该条分录?", "提示", {
-        cancelButtonText: "确定",
-        confirmButtonText: "取消",
+        cancelButtonText: "取消",
+        confirmButtonText: "确定",
         center: true
       }).then(() => {
         this.axios