tijiao

build/utils.js

@@ -16,9 +16,9 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //    物流         进程     成本   报表          基础配置        系统配置
 //  'logistics', 'process', '   ', 'reportform', 'basicconfig', 'system']
 // let devModules = ['index','RMS','systemConfig','TMS']
-// let devModules = ['all'];
+let devModules = ['all'];
 // let devModules = ['index','inward','appoint','sale']
-let devModules = ['index','SporadicManage','inward','RMS']
+// let devModules = ['index','SporadicManage','inward','RMS']
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;
 }

src/views/TMS/components/importedFuel/transportReserveRanAdd.vue

@@ -450,11 +450,7 @@ export default {
               state = 0;
             }
           } else {
-            this.$message({
-              message: "重量不能为空!",
-              type: "warning",
-            });
-            state = 0;
+            state = 1;
           }
         });
       }

src/views/appoint/components/saleContract/addSaleOrderSend copy.vue

@@ -1,597 +0,0 @@
-<template>
-  <!-- 添加销售订单排车 -->
-  <div class="addSalePlan">
-    <page-title>新增销售订单派车</page-title>
-    <div>
-      <el-tabs v-model="activeName">
-        <dilTable ref="tab" v-bind.sync="option"> </dilTable>
-      </el-tabs>
-    </div>
-
-    <el-form :inline="true" style="margin-top: 2rem">
-      <el-form-item>
-        <label
-          class="el-form-item__label"
-          style="width: auto; margin-left: 2rem"
-          >物资名称:</label
-        >
-        <el-select v-model="materials" placeholder="请选择">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <div class="lineId">
-          <div class="materialId">
-            <label
-              class="el-form-item__label"
-              style="width: auto; margin-left: 2rem"
-              >承运商:</label
-            >
-            <el-input class="input" v-model="carrierName" disabled> </el-input>
-            <el-button type="primary" class="btn" @click="table2 = true"
-              >浏览</el-button
-            >
-          </div>
-        </div>
-      </el-form-item>
-      <el-form-item>
-        <div class="lineId">
-          <div class="materialId">
-            <label
-              class="el-form-item__label"
-              style="width: auto; margin-left: 2rem"
-              >选择路线:</label
-            >
-            <el-input class="input" v-model="lineName" disabled> </el-input>
-            <el-button type="primary" class="btn" @click="table1 = true"
-              >浏览</el-button
-            >
-          </div>
-        </div>
-      </el-form-item>
-    </el-form>
-
-    <!-- 承运商模态框 -->
-    <el-drawer
-      title="选择承运商"
-      :visible.sync="table2"
-      direction="rtl"
-      size="35%"
-      :show-close="false"
-    >
-      <el-input
-        placeholder="请输入内容"
-        v-model="index"
-        style="margin-top: 10px; margin-left: 20px; width: 160px"
-        clearable
-      >
-      </el-input
-      ><el-button
-        type="primary"
-        class="btn"
-        @click="onclick(1)"
-        style="margin-left: 4px"
-      >
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <div class="tablecls">
-        <!-- 查询所有的承运商 -->
-        <dilTable v-bind.sync="carrier" @radio-change="currentRadioChange2">
-        </dilTable>
-      </div>
-    </el-drawer>
-
-    <!-- 选择路线模态窗口 -->
-    <el-drawer
-      title="选择路线"
-      :visible.sync="table1"
-      direction="rtl"
-      size="50%"
-      :show-close="false"
-    >
-      <el-input
-        placeholder="请输入内容"
-        v-model="input"
-        style="margin-top: 10px; margin-left: 20px; width: 160px"
-        clearable
-      >
-      </el-input
-      ><el-button
-        type="primary"
-        class="btn"
-        @click="onclick1"
-        style="margin-left: 4px"
-      >
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <div class="tablecls">
-        <!-- 查询所有的路线 -->
-        <dilTable
-          v-bind.sync="line"
-          @radio-change="currentRadioChange5"
-        ></dilTable>
-      </div>
-    </el-drawer>
-
-    <!-- 选择新增条数及确认按钮 -->
-    <div class="lineId">
-      <div class="materialId">
-        <label
-          class="el-form-item__label"
-          style="width: auto; margin-left: 2rem; margin-top: 0.3rem"
-          >派车数:</label
-        >
-        <el-input class="input1" v-model="carCount"> </el-input>
-        <el-button type="primary" class="btn" @click="makeSure1"
-          >确认分派</el-button
-        >
-      </div>
-    </div>
-
-    <!-- 派车表格 -->
-    <div class="selectionTable from">
-      <el-table
-        :data="selectionList"
-        border
-        style="width: 100%"
-        highlight-current-row
-      >
-        <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
-        >
-          <template slot="scope" v-if="item.label !== '重量'">
-            <span>{{ item.label }}</span>
-          </template>
-          <template slot="scope" v-if="item.label !== '车牌号'">
-            <span>{{ item.label }}</span>
-          </template>
-          <template slot="scope" v-if="item.label !== '收货地址'">
-            <span>{{ item.label }}</span>
-          </template>
-          <template slot="scope" v-if="item.label !== '收货日期'">
-            <span>{{ item.label }}</span>
-          </template>
-          <template slot="scope" v-if="item.label !== '收货姓名'">
-            <span>{{ item.label }}</span>
-          </template>
-          <template slot="scope" v-if="item.label !== '收货方电话'">
-            <span>{{ item.label }}</span>
-          </template>
-          <!-- 插入输入框 -->
-          <template slot-scope="scope">
-            <template v-if="item.slot">
-              <!-- 车牌号 -->
-              <template v-if="item.prop == 'capacityNumber'">
-                <el-input
-                  class="textinput1"
-                  v-model.number="scope.row.capacityNumber"
-                ></el-input>
-              </template>
-              <!-- 物资重量 -->
-              <template v-if="item.prop == 'orderPlanWeight'">
-                <el-input
-                  class="textinput"
-                  v-model.number="scope.row.orderPlanWeight"
-                ></el-input>
-              </template>
-
-              <!-- 收货地址id -->
-              <template
-                style="width: 400px"
-                v-if="item.prop == 'saleShipperAddressName'"
-              >
-                <el-input
-                  style="width: 200px"
-                  v-model="scope.row.saleShipperAddressName"
-                  disabled
-                >
-                </el-input>
-                <el-button
-                  type="primary"
-                  @click="ondrawer(scope.row, scope.$index)"
-                  >浏览</el-button
-                >
-              </template>
-              <!-- 收货日期 -->
-              <template v-if="item.prop == 'saleDateOfReceipt'">
-                <el-date-picker
-                  class="textinput3"
-                  type="date"
-                  v-model.number="scope.row.saleDateOfReceipt"
-                ></el-date-picker>
-              </template>
-              <!-- 收货客户 -->
-              <template v-if="item.prop == 'saleOrderConsignee'">
-                <el-input
-                  class="textinput4"
-                  v-model.number="scope.row.saleOrderConsignee"
-                ></el-input>
-              </template>
-              <!-- 收货客户电话号码 -->
-              <template v-if="item.prop == 'saleOrderConsigneeTel'">
-                <el-input
-                  class="textinput5"
-                  v-model.number="scope.row.saleOrderConsigneeTel"
-                ></el-input>
-              </template>
-            </template>
-            <template v-else>
-              <span>{{ scope.row[item.prop] }}</span>
-            </template>
-          </template>
-        </el-table-column>
-        <!-- 操作列 -->
-        <el-table-column fixed="right" label="操作" width="100">
-          <template slot-scope="scope">
-            <el-button
-              @click.native.prevent="deleteRow(scope.$index, selectionList)"
-              type="text"
-              icon="el-icon-close"
-              size="big"
-            ></el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <el-drawer
-      :visible.sync="drawer"
-      :direction="direction"
-      :close-on-press-escape="true"
-      :show-close="true"
-      :wrapperClosable="true"
-      modal
-      size="30%"
-    >
-      <el-input
-        placeholder="请输入内容"
-        v-model="textInput"
-        style="margin-top: 10px; margin-left: 20px; width: 200px"
-        clearable
-      >
-      </el-input>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="onclick(2)"
-        style="margin-bottom: 15px"
-      >
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <dilTable
-        v-bind.sync="frist"
-        @radio-change="currentRadioChange1"
-      ></dilTable>
-    </el-drawer>
-
-    <div class="button-box">
-      <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
-    </div>
-  </div>
-</template>
-<script>
-import PageTitle from "@/components/Page/Title";
-import { sjTime, isNumber} from "@/utils/sharedJsFile";
-export default {
-  components: { PageTitle },
-  data() {
-    return {
-      materials: "",
-      //线路
-      table1: false,
-      lineName: "",
-      line: {
-        requestUrl: "/api/v1/rms/getAllLineDesk?apiId=249&lineType=3",
-        selectionType: "radio",
-      },
-      //承运商
-      table2: false,
-      carrierName: "",
-      carrier: {
-        requestUrl: "/api/v1/uc/getCarrierListByLike?apiId=412",
-        selectionType: "radio",
-      },
-      //新增车数
-      carCount: 1,
-
-      textInput: "",
-      input: "",
-      //销售订单物资信息
-      option: {
-        // 表格请求数据的地址
-        requestUrl:
-          "/api/v1/ams/getSaleOrderAndMaterialById?apiId=410&saleOrderId=" +
-          this.$route.params.saleOrderId,
-      },
-      table: false,
-      //表格数据lists
-      selectionList: [],
-      //表格新增lists
-      selectionList1: [],
-      drawer: false,
-      direction: "rtl",
-      form1: {},
-      value: false,
-      frist: {
-        requestUrl: "/api/v1/ams/getAddressDeliveryAddress?apiId=255",
-        selectionType: "radio",
-        mapList: [],
-      },
-      options: [
-        {
-          values: "yes",
-          label: "是",
-        },
-        {
-          values: "no",
-          label: "否",
-        },
-      ],
-      values: "yes",
-      tableTop: [
-        {
-          prop: "capacityNumber",
-          label: "车牌号",
-          slot: true,
-        },
-        {
-          prop: "materialName",
-          label: "物资名称",
-          width: "140",
-        },
-        {
-          prop: "carrierName",
-          label: "承运商",
-          width: "120",
-        },
-        {
-          prop: "lineName",
-          label: "运输线路",
-          width: "140",
-        },
-        {
-          prop: "orderPlanWeight",
-          label: "重量",
-          slot: true,
-        },
-        {
-          prop: "saleShipperAddressName",
-          label: "收货地址",
-          width: "300",
-          slot: true,
-        },
-        {
-          prop: "saleDateOfReceipt",
-          label: "收货日期",
-          width: "110",
-          slot: true,
-        },
-        {
-          prop: "saleOrderConsignee",
-          label: "收货客户",
-          slot: true,
-        },
-        {
-          prop: "saleOrderConsigneeTel",
-          label: "收货客户电话号码",
-          slot: true,
-        },
-      ],
-      row: {},
-    };
-  },
-  watch: {},
-  methods: {
-    currentRadioChange2(selectoin) {
-      console.log("selectoin", selectoin);
-      this.carrierName = selectoin.carrierName;
-    },
-    currentRadioChange5(selection) {
-      this.lineName = selection.lineName;
-    },
-    //删除派车列
-    deleteRow(index, rows) {
-      rows.splice(index, 1);
-    },
-    //点击浏览事件
-    ondrawer(row, index) {
-      this.row = row;
-      this.row.index = index;
-      this.drawer = true;
-    },
-    //监听模态框点击事件
-    currentRadioChange1(radioList) {
-      this.selectionList[this.row.index].saleShipperAddressId =
-        radioList.addressId;
-      this.selectionList[this.row.index].saleShipperAddressName =
-        radioList.address;
-    },
-    //收货地址模态框查询
-    onclick1() {
-      this.option.requestUrl =
-        "/api/v1/ams/getAddressDeliveryAddress?apiId=255&con=" + this.textInput;
-    },
-    //物资模态框查询
-    // 框计算
-    onclick(num) {
-      //主界面的框计算
-      if(num == 1){
-        this.option.requestUrl =
-        "/api/v1/ams/getSaleOrderAndMaterialById?apiId=410&saleOrderId=" +
-        this.$route.params.saleOrderId;
-      }else if(num == 2){
-        //
-      }
-    },
-    open() {
-      if (this.selectionList1.length != 0) {
-        this.$confirm("取消会将已选择的数据清空, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.selectionList1 = [];
-            this.table = false;
-          })
-          .catch(() => {});
-      } else {
-        this.table = false;
-      }
-    },
-    // 确定
-    makeSure() {
-      //初始化maplist
-      var mapList = [];
-      console.log("this.selectionList", this.selectionList);
-      this.selectionList.forEach((item, i) => {
-        //初始化mapItem
-        var mapItem = {
-          //销售订单id
-          saleOrderId: 0,
-          //车序号
-          truckNo: "",
-          //收货地址id
-          shippingAddressId: 0,
-          //收货日期
-          dateOfReceipt: null,
-          //收货方姓名
-          orderConsignee: "",
-          //收货方电话
-          orderConsigneeTel: "",
-          //车序号物资ID
-          saleMaterialId: 0,
-          //物资数量
-          materialNumber: 0,
-        };
-        mapItem.saleOrderId = this.$route.params.saleOrderId;
-        mapItem.truckNo = item.cxh;
-        mapItem.shippingAddressId = item.saleShipperAddressId;
-        mapItem.dateOfReceipt = item.saleDateOfReceipt;
-        mapItem.orderConsignee = item.saleOrderConsignee;
-        mapItem.orderConsigneeTel = item.saleOrderConsigneeTel;
-        mapItem.saleMaterialId = item.saleMaterialId;
-        mapItem.materialNumber = item.orderPlanWeight;
-        mapList.push(mapItem);
-      });
-      // console.log("mapList",mapList);
-      this.axios.post("/api/v1/ams/addTruckNo", mapList).then((res) => {
-        if (res.data.code == "200") {
-          this.$router.go(-1);
-        }
-        this.$message({
-          type: "success",
-          message: "新增车序号成功!",
-        });
-      });
-    },
-    // 取消
-    cancel() {
-      this.$router.go(-1);
-    },
-    //关闭事件
-    handleClose(done) {
-      this.$confirm("确认关闭？")
-        .then((_) => {
-          done();
-        })
-        .catch((_) => {});
-    },
-
-    CloseClick() {},
-  },
-};
-</script>
-<style lang='scss' scoped>
-.addSalePlan {
-  width: 100%;
-}
-.switch {
-  margin-left: 60rem;
-}
-.lineId {
-  display: flex;
-  justify-content: center;
-  margin-left: 2rem;
-  .text {
-    display: inline-block;
-    width: 170px;
-    text-align: right;
-  }
-  .input {
-    width: 250px;
-    margin-right: 20px;
-  }
-  .input1 {
-    width: 60px;
-    margin-right: 20px;
-  }
-}
-.form-box,
-.from {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 5px;
-  margin-bottom: 20px;
-}
-.button-box {
-  display: flex;
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  margin-top: 0.3125rem;
-  margin-bottom: 1.25rem;
-}
-.select {
-  margin-left: 2rem;
-}
-.makeSureAdd {
-  width: 100px;
-  margin-left: 3.5rem;
-  margin-top: 0.3rem;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-  display: flex;
-}
-.demo-form-inline {
-  margin-left: 2rem;
-}
-.table_form {
-  margin-left: -16rem;
-}
-.textinput {
-  width: 50px;
-}
-.textinput1 {
-  width: 50px;
-  text-align: center;
-  size: small;
-}
-.textinput2 {
-  width: 50px;
-  margin-right: 30px;
-}
-.textinput3 {
-  width: 270px;
-}
-.textinput4 {
-  width: 60px;
-}
-.textinput5 {
-  width: 120px;
-}
-</style>

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

@@ -142,11 +142,9 @@
     <!-- 线路模态框 -->
     <el-drawer 
       :visible.sync="drawer" 
-      :with-header="false"
       :destroy-on-close="false"
       direction="rtl"
       size="40%"
-      :show-close="false"
       :wrapperClosable="false"
       modal
       close-on-press-escape
@@ -186,11 +184,9 @@
     <!-- 车辆模态框 -->
     <el-drawer 
       :visible.sync="truckDrawer" 
-      :with-header="false"
       :destroy-on-close="false"
       direction="rtl"
       size="40%"
-      :show-close="false"
       :wrapperClosable="false"
       modal
       close-on-press-escape
@@ -230,11 +226,9 @@
     <!-- 收货地址的模态框 -->
     <el-drawer 
       :visible.sync="addressDrawer" 
-      :with-header="false"
       :destroy-on-close="false"
       direction="rtl"
       size="40%"
-      :show-close="false"
       :wrapperClosable="false"
       modal
       close-on-press-escape
@@ -369,7 +363,7 @@ export default {
         },
         {
           prop: "saleDateOfReceipt",
-          label: "收货日期",
+          label: "发货日期",
           width: "270",
           slot: true,
         },
@@ -582,9 +576,9 @@ export default {
         this.drawer = true;
       }else if(num == 2){
         if(!this.materialId){
-          this.$message.warning('请选择物资后，在点击')
+          this.$message.warning('请选择物资后，再点击')
         }else if(!this.lineId){
-          this.$message.warning('请选择线路后，在点击')
+          this.$message.warning('请选择线路后，再点击')
         }else{
           this.truckDrawer = true;
         }
@@ -597,7 +591,7 @@ export default {
     //线路表格的确定事件
     AddClick(){
       this.drawer = false;
-      this.lineName = this.cacheLine.lineName;
+      this.lineName = this.cacheLine.lineName +"  "+ this.cacheLine.lineDesk;
       this.lineId = this.cacheLine.lineId;
     }
   },
@@ -613,7 +607,7 @@ export default {
       justify-content: center;
       align-items: center;
       .el-input {
-        width: 250px;
+        width: 350px;
         margin-left: 10px;
         margin-right: 10px;
       }

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

@@ -98,60 +98,10 @@
 
         </dilTable>
       </el-tab-pane>
-
-
-      <!-- 财务已审批 -->
-      <el-tab-pane label="财务已审批" name="third">
-        <dilTable v-bind.sync="option3" ref="table1">
-          <el-table-column fixed="right" label="操作" width="200">
-            <template slot-scope="scope">
-              <el-button
-                @click="lookclick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >查看</el-button
-              >
-              <el-button
-                @click="passclick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >修改日志</el-button
-              >
-              <el-button
-                @click="detailclick1(scope.row)"
-                type="text"
-                size="small"
-                >物资详情</el-button
-              >
-            </template>
-          </el-table-column>
-        <!-- 物资详情抽屉 -->
-        <el-table-column type="expand" width="1">
-          <template slot-scope="props">
-            <el-form label-position="center" inline class="demo-table-expand">
-              <div v-if="false">{{ props }}</div>
-              <div>
-                <el-table :data="tableData1" border >
-                  <el-table-column
-                    v-for="(item, i) in tableHead"
-                    :key="i"
-                    :prop="item.prop"
-                    :label="item.label"
-                    :width="item.width"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </el-form>
-          </template>
-        </el-table-column>
-
-
-        </dilTable>
-      </el-tab-pane>
-      <!-- 销售公司已审批 -->
-       <el-tab-pane label="销售公司已审批" name="four">
+      <!-- 已审批 -->
+       <el-tab-pane label="已审批" name="four">
         <dilTable v-bind.sync="option4" ref="table">
-          <el-table-column fixed="right" label="操作" width="130">
+          <el-table-column fixed="right" label="操作" width="200">
             <template slot-scope="scope">
               <el-button
                 @click="sendClick(scope.row.saleOrderId)"
@@ -280,7 +230,13 @@ export default {
       console.log(tab, event);
     },
     onclick() {
-      console.log(this.input);
+      if(this.activeName == "first"){
+        this.option.requestUrl = "/api/v1/ams/getSaleOrderInfoes?apiId=408&con="+this.input;
+      }else if(this.activeName == "second"){
+        this.option2.requestUrl = "/api/v1/ams/getSaleOrderReportedes?apiId=408&con="+this.input;      
+      }else if(this.activeName == "four"){
+        this.option4.requestUrl = "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&con="+this.input;      
+      }
     },
     seeclick(saleOrderId) {
       this.$router.push("/saleOrderDetail/" + saleOrderId);
@@ -297,10 +253,7 @@ export default {
     sendClick(saleOrderId){
       this.$router.push("/addSaleOrderSend/" + saleOrderId);
     },
-    // detailedClick(saleOrderId){
-    //   this.$router.push("saleOrderMaterial/" + saleOrderId);
-    // },
-    // -------查看物资详情 (销售公司已审批)
+    // -------查看物资详情 (已审批)
     detailclick(row) {
       // 记录重复点击次数
       if (this.oldRow === row) {

src/views/sale/components/transport_excute/enFactoryResult.vue

@@ -48,7 +48,7 @@ export default {
       inputText: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=1",
+        requestUrl: "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=2",
       },
       //记录旧的row对象
       oldRow: "",
@@ -83,7 +83,7 @@ export default {
     //   框计算
     onclick() {
       this.option.requestUrl =
-        "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=1&con="+
+        "/api/v1/tms/getAllEnFactoryResult?apiId=210&orderType=2&con="+
         this.inputText;
     },
     // 查看物资详情
@@ -116,6 +116,11 @@ export default {
       this.axios
         .get("/api/v1/tms/getMaterial?orderId=" + orderId)
         .then((res) => {
+          res.data.data.forEach(e => {
+            if(e.specificationModel == "()"){
+              e.specificationModel = null;
+            } 
+          });
           this.tableData = res.data.data;
         });
     },

src/views/sale/components/transport_excute/grossWeightResult.vue

@@ -24,13 +24,13 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=212&orderType=1",
+                requestUrl: "/api/v1/tms/getAllJiMaoResult?apiId=212&orderType=2",
             },
         }
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=1&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=2&con="+this.inputText;
         }
     }
 }

src/views/sale/components/transport_excute/loadTruckResult.vue

@@ -22,14 +22,14 @@ export default {
       option: {
         // 表格请求数据的地址
         requestUrl:
-          "/api/v1/tms/getAllLoadResult?apiId=221&status=0&orderType=1",
+          "/api/v1/tms/getAllLoadResult?apiId=221&status=0&orderType=2",
       },
     };
   },
   methods: {
     onclick() {
       this.option.requestUrl =
-        "/api/v1/tms/getAllLoadResult?apiId=221&status=0&orderType=1&con=" + this.inputText;
+        "/api/v1/tms/getAllLoadResult?apiId=221&status=0&orderType=2&con=" + this.inputText;
     },
   },
 

src/views/sale/components/transport_excute/outFactory/outFactoryResult.vue

@@ -48,7 +48,7 @@ export default {
       inputText: "",
       option: {
         // 表格请求数据的地址
-        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=225&orderType=1",
+        requestUrl: "/api/v1/tms/getLeaveFactoryResult?apiId=225&orderType=2",
       },
       //记录旧的row对象
       oldRow: "",
@@ -116,6 +116,11 @@ export default {
       this.axios
         .get("/api/v1/tms/getMaterial?orderId=" + orderId)
         .then((res) => {
+          res.data.data.forEach(e => {
+            if(e.specificationModel == "()"){
+              e.specificationModel = null;
+            } 
+          });
           this.tableData = res.data.data;
         });
     },

src/views/sale/components/transport_excute/qualityResult.vue

@@ -24,13 +24,13 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/tms/getQualityResult?apiId=413&orderType=1",
+                requestUrl: "/api/v1/tms/getQualityResult?apiId=413&orderType=2",
             },
         }
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=125&orderType=1&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/tms/getQualityResult?apiId=125&orderType=2&con="+this.inputText;
         }
     }
 }

src/views/sale/components/transport_excute/returnResult.vue

@@ -24,13 +24,13 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/qms/getQueueApply?apiId=125&orderType=1",
+                requestUrl: "/api/v1/qms/getQueueApply?apiId=125&orderType=2",
             },
         }
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=1&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/qms/getQueueApply?apiId=125&orderType=2&con="+this.inputText;
         }
     }
 }

src/views/sale/components/transport_excute/tareWeightResult.vue

@@ -24,13 +24,13 @@ export default {
             inputText:'',
             option: {       
                 // 表格请求数据的地址
-                requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=1",
+                requestUrl: "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=2",
             },
         }
     },
     methods:{
         onclick(){
-            this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=1&con="+this.inputText;
+            this.option.requestUrl = "/api/v1/tms/getAllJiPiResult?apiId=211&orderType=2&con="+this.inputText;
         }
     }
 }

src/views/sale/components/transport_order/receiveOrder.vue

@@ -1,289 +1,327 @@
 // 接收运单
 <template>
-	<div class="steel_inbound">
-		<div class="sache">
-			<el-input placeholder="请输入内容" v-model="inputText" clearable>
-			</el-input>
-			<el-button type="primary" class="btn" @click="onClick">
-				<i class="el-icon-search"></i>查询
-			</el-button>
-		</div>
-		<template>
-			<div>
-				<el-tabs v-model="activeName">
-					<!-- 已接收 -->
-					<el-tab-pane label="已接收" name="first">
-						<dilTable v-bind.sync="first" ref="table">
-							<el-table-column fixed="right" label="操作" width="50">
-								<template slot-scope="scope">
-								<el-button @click="detailclick(scope.row)" type="text" size="small">
-									物资详情
-								</el-button>
-								</template>
-							</el-table-column>
-							 <!-- 物资详情抽屉 -->
-							<el-table-column type="expand" width="1">
-							<template slot-scope="props">
-								<el-form label-position="center" inline class="demo-table-expand">
-								<div v-if="false">{{ props }}</div>
-								<div>
-									<el-table :data="tableData" border >
-									<el-table-column
-										v-for="(item, i) in tableHead"
-										:key="i"
-										:prop="item.prop"
-										:label="item.label"
-										:width="item.width"
-									></el-table-column>
-									</el-table>
-								</div>
-								</el-form>
-							</template>
-							</el-table-column>
-						</dilTable>
-					</el-tab-pane>
-					<!-- 已拒绝 -->
-					<el-tab-pane label="已拒绝" name="second">
-						<dilTable v-bind.sync="second" ref="table1">
-							<el-table-column fixed="right" label="操作" width="50">
-								<template slot-scope="scope">
-								<el-button @click="detailclick1(scope.row)" type="text" size="small">
-									物资详情
-								</el-button>
-								</template>
-							</el-table-column>
-							 <!-- 物资详情抽屉 -->
-							<el-table-column type="expand" width="1">
-							<template slot-scope="props">
-								<el-form label-position="center" inline class="demo-table-expand">
-								<div v-if="false">{{ props }}</div>
-								<div>
-									<el-table :data="tableData1" border >
-									<el-table-column
-										v-for="(item, i) in tableHead"
-										:key="i"
-										:prop="item.prop"
-										:label="item.label"
-										:width="item.width"
-									></el-table-column>
-									</el-table>
-								</div>
-								</el-form>
-							</template>
-							</el-table-column>
-						</dilTable>
-					</el-tab-pane>
-					<!-- 未接收 -->
-					<el-tab-pane label="未接收" name="third">
-						<dilTable v-bind.sync="third" ref="table2">
-							<el-table-column fixed="right" label="操作" width="50">
-								<template slot-scope="scope">
-								<el-button @click="detailclick2(scope.row)" type="text" size="small">
-									物资详情
-								</el-button>
-								</template>
-							</el-table-column>
-							 <!-- 物资详情抽屉 -->
-							<el-table-column type="expand" width="1">
-							<template slot-scope="props">
-								<el-form label-position="center" inline class="demo-table-expand">
-								<div v-if="false">{{ props }}</div>
-								<div>
-									<el-table :data="tableData2" border >
-									<el-table-column
-										v-for="(item, i) in tableHead"
-										:key="i"
-										:prop="item.prop"
-										:label="item.label"
-										:width="item.width"
-									></el-table-column>
-									</el-table>
-								</div>
-								</el-form>
-							</template>
-							</el-table-column>
-						</dilTable>
-					</el-tab-pane>
-				</el-tabs>
-			</div>
-		</template>
-	</div>
-
+  <div class="steel_inbound">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="inputText" clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onClick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+    </div>
+    <template>
+      <div>
+        <el-tabs v-model="activeName">
+          <!-- 已接收 -->
+          <el-tab-pane label="已接收" name="first">
+            <dilTable v-bind.sync="first" ref="table">
+              <el-table-column fixed="right" label="操作" width="50">
+                <template slot-scope="scope">
+                  <el-button
+                    @click="detailclick(scope.row)"
+                    type="text"
+                    size="small"
+                  >
+                    物资详情
+                  </el-button>
+                </template>
+              </el-table-column>
+              <!-- 物资详情抽屉 -->
+              <el-table-column type="expand" width="1">
+                <template slot-scope="props">
+                  <el-form
+                    label-position="center"
+                    inline
+                    class="demo-table-expand"
+                  >
+                    <div v-if="false">{{ props }}</div>
+                    <div>
+                      <el-table :data="tableData" border>
+                        <el-table-column
+                          v-for="(item, i) in tableHead"
+                          :key="i"
+                          :prop="item.prop"
+                          :label="item.label"
+                          :width="item.width"
+                        ></el-table-column>
+                      </el-table>
+                    </div>
+                  </el-form>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <!-- 已拒绝 -->
+          <el-tab-pane label="已拒绝" name="second">
+            <dilTable v-bind.sync="second" ref="table1">
+              <el-table-column fixed="right" label="操作" width="50">
+                <template slot-scope="scope">
+                  <el-button
+                    @click="detailclick1(scope.row)"
+                    type="text"
+                    size="small"
+                  >
+                    物资详情
+                  </el-button>
+                </template>
+              </el-table-column>
+              <!-- 物资详情抽屉 -->
+              <el-table-column type="expand" width="1">
+                <template slot-scope="props">
+                  <el-form
+                    label-position="center"
+                    inline
+                    class="demo-table-expand"
+                  >
+                    <div v-if="false">{{ props }}</div>
+                    <div>
+                      <el-table :data="tableData1" border>
+                        <el-table-column
+                          v-for="(item, i) in tableHead"
+                          :key="i"
+                          :prop="item.prop"
+                          :label="item.label"
+                          :width="item.width"
+                        ></el-table-column>
+                      </el-table>
+                    </div>
+                  </el-form>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+          <!-- 未接收 -->
+          <el-tab-pane label="未接收" name="third">
+            <dilTable v-bind.sync="third" ref="table2">
+              <el-table-column fixed="right" label="操作" width="50">
+                <template slot-scope="scope">
+                  <el-button
+                    @click="detailclick2(scope.row)"
+                    type="text"
+                    size="small"
+                  >
+                    物资详情
+                  </el-button>
+                </template>
+              </el-table-column>
+              <!-- 物资详情抽屉 -->
+              <el-table-column type="expand" width="1">
+                <template slot-scope="props">
+                  <el-form
+                    label-position="center"
+                    inline
+                    class="demo-table-expand"
+                  >
+                    <div v-if="false">{{ props }}</div>
+                    <div>
+                      <el-table :data="tableData2" border>
+                        <el-table-column
+                          v-for="(item, i) in tableHead"
+                          :key="i"
+                          :prop="item.prop"
+                          :label="item.label"
+                          :width="item.width"
+                        ></el-table-column>
+                      </el-table>
+                    </div>
+                  </el-form>
+                </template>
+              </el-table-column>
+            </dilTable>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </template>
+  </div>
 </template>
 <script>
 import { getCookie } from "@/utils/util.js";
-	export default {
-		data() {
-			return {
-				inputText: "",
-				first: {
-					// first请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierSsoId="+ getCookie('userId'),
-				},
-				second: {
-					// second请求数据的地址，承运商暂时设置为默认（运输订单状态为）
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=6&carrierSsoId="+ getCookie('userId'),
-				},
-				third: {
-					// second请求数据的地址
-					requestUrl: "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierSsoId="+ getCookie('userId'),
-				},
-				activeName: "first",
-				//记录旧的row对象(已接收)
-				oldRow: "",
-				//记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已接收)
-				oldRowCount: 1,
-				//记录旧的row对象(已拒绝)
-				oldRow1: "",
-				//记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已拒绝)
-				oldRowCount1: 1,
-				//记录旧的row对象(未接收)
-				oldRow1: "",
-				//记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未接收)
-				oldRowCount1: 1,
-				tableHead: [
-					{
-					prop: "materialName",
-					label: "物资名称",
-					width: 150,
-					},
-					{
-					prop: "specificationModel",
-					label: "规格型号",
-					width: 150,
-					},
-					{
-					prop: "materialNumber",
-					label: "物资件数",
-					width: 100,
-					},
-					{
-					prop: "materialWeight",
-					label: "物资重量",
-					width: 100,
-					},
-				],
-				tableData: [],
-				tableData1: [],
-				tableData2: [],
-			}
-		},
-		methods: {
-		 onClick(){
-			  if(this.activeName == "first"){
-              this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierSsoId="+ getCookie('userId')+"&con=" + this.input;
-             }else if (this.activeName == "second") {
-			          this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&carrierSsoId="+ getCookie('userId')+"&con=" + this.input;
-		     } else {
-			   this.option1.requestUrl = "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierSsoId="+ getCookie('userId')+"&con=" + this.input;
-		  }
-        
-      
-		 },
-		// -------查看物资详情(已接收)
-		detailclick(row) {
-		// 记录重复点击次数
-		if (this.oldRow === row) {
-			this.oldRowCount += 1;
-		}
-		// 切换当前详情表
-		this.$refs.table.toggleRowExpansion(row);
-		// 打开前关闭上一个详情表
-		if (this.oldRow != "") {
-			if (this.oldRow != row) {
-			if (this.oldRowCount % 2 === 1) {
-				this.$refs.table.toggleRowExpansion(this.oldRow);
-			} else {
-				this.oldRowCount = 1;
-			}
-			} else {
-			this.oldRow = null;
-			return;
-			}
-		}
-		// 重置上一个点击对象
-		this.oldRow = row;
-		// 根据销售订单物资中间表id查询物资信息
-		this.axios
-			.post("/api/v1/oms/getOrderMaterialList?orderId=" +row.orderId)
-			.then((res) => {
-			this.tableData = res.data.data;
-			});
-		},
-		
-		// -------查看物资详情(已拒绝)
-		detailclick1(row) {
-		// 记录重复点击次数
-		if (this.oldRow1 === row) {
-			this.oldRowCount1 += 1;
-		}
-		// 切换当前详情表
-		this.$refs.table1.toggleRowExpansion(row);
-		// 打开前关闭上一个详情表
-		if (this.oldRow1 != "") {
-			if (this.oldRow1 != row) {
-			if (this.oldRowCount1 % 2 === 1) {
-				this.$refs.table1.toggleRowExpansion(this.oldRow1);
-			} else {
-				this.oldRowCount1 = 1;
-			}
-			} else {
-			this.oldRow1 = null;
-			return;
-			}
-		}
-		// 重置上一个点击对象
-		this.oldRow1 = row;
-		// 根据销售订单物资中间表id查询物资信息
-		this.axios
-			.post("/api/v1/oms/getOrderMaterialList?orderId=" +row.orderId)
-			.then((res) => {
-			this.tableData1 = res.data.data;
-			});
-		},
+export default {
+  data() {
+    return {
+      inputText: "",
+      first: {
+        // first请求数据的地址，承运商(运输订单状态为已接收，接收状态为已接收)
+        requestUrl:
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=5&carrierSsoId=" +
+          getCookie("userId"),
+      },
+      second: {
+        // second请求数据的地址，承运商暂时设置为默认（运输订单状态为）
+        requestUrl:
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=6&carrierSsoId=" +
+          getCookie("userId"),
+      },
+      third: {
+        // second请求数据的地址
+        requestUrl:
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=2&orderStatus=4&carrierSsoId=" +
+          getCookie("userId"),
+      },
+      activeName: "first",
+      //记录旧的row对象(已接收)
+      oldRow: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已接收)
+      oldRowCount: 1,
+      //记录旧的row对象(已拒绝)
+      oldRow1: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(已拒绝)
+      oldRowCount1: 1,
+      //记录旧的row对象(未接收)
+      oldRow1: "",
+      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态(未接收)
+      oldRowCount1: 1,
+      tableHead: [
+        {
+          prop: "materialName",
+          label: "物资名称",
+          width: 150,
+        },
+        {
+          prop: "specificationModel",
+          label: "规格型号",
+          width: 150,
+        },
+        {
+          prop: "materialNumber",
+          label: "物资件数",
+          width: 100,
+        },
+        {
+          prop: "materialWeight",
+          label: "物资重量",
+          width: 100,
+        },
+      ],
+      tableData: [],
+      tableData1: [],
+      tableData2: [],
+    };
+  },
+  methods: {
+    onClick() {
+      if (this.activeName == "first") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=5&carrierSsoId=" +
+          getCookie("userId") +
+          "&con=" +
+          this.input;
+      } else if (this.activeName == "second") {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&carrierSsoId=" +
+          getCookie("userId") +
+          "&con=" +
+          this.input;
+      } else {
+        this.option1.requestUrl =
+          "/api/v1/oms/getDriverInfoForSale?apiId=226&orderType=1&orderStatus=4&carrierSsoId=" +
+          getCookie("userId") +
+          "&con=" +
+          this.input;
+      }
+    },
+    // -------查看物资详情(已接收)
+    detailclick(row) {
+      // 记录重复点击次数
+      if (this.oldRow === row) {
+        this.oldRowCount += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow != "") {
+        if (this.oldRow != row) {
+          if (this.oldRowCount % 2 === 1) {
+            this.$refs.table.toggleRowExpansion(this.oldRow);
+          } else {
+            this.oldRowCount = 1;
+          }
+        } else {
+          this.oldRow = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow = row;
+      // 根据销售订单物资中间表id查询物资信息
+      this.axios
+        .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
+        .then((res) => {
+          this.tableData = res.data.data;
+        });
+    },
 
-		// -------查看物资详情(未接收)
-		detailclick2(row) {
-		// 记录重复点击次数
-		if (this.oldRow2 === row) {
-			this.oldRowCount2 += 1;
-		}
-		// 切换当前详情表
-		this.$refs.table2.toggleRowExpansion(row);
-		// 打开前关闭上一个详情表
-		if (this.oldRow2 != "") {
-			if (this.oldRow2 != row) {
-			if (this.oldRowCount2 % 2 === 1) {
-				this.$refs.table2.toggleRowExpansion(this.oldRow2);
-			} else {
-				this.oldRowCount2 = 1;
-			}
-			} else {
-			this.oldRow2 = null;
-			return;
-			}
-		}
-		// 重置上一个点击对象
-		this.oldRow2 = row;
-		// 根据销售订单物资中间表id查询物资信息
-		this.axios
-			.post("/api/v1/oms/getOrderMaterialList?orderId=" +row.orderId)
-			.then((res) => {
-			this.tableData2 = res.data.data;
-			});
-		},
+    // -------查看物资详情(已拒绝)
+    detailclick1(row) {
+      // 记录重复点击次数
+      if (this.oldRow1 === row) {
+        this.oldRowCount1 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table1.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow1 != "") {
+        if (this.oldRow1 != row) {
+          if (this.oldRowCount1 % 2 === 1) {
+            this.$refs.table1.toggleRowExpansion(this.oldRow1);
+          } else {
+            this.oldRowCount1 = 1;
+          }
+        } else {
+          this.oldRow1 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow1 = row;
+      // 根据销售订单物资中间表id查询物资信息
+      this.axios
+        .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
+        .then((res) => {
+          this.tableData1 = res.data.data;
+        });
+    },
 
-		 }
-	}
+    // -------查看物资详情(未接收)
+    detailclick2(row) {
+      // 记录重复点击次数
+      if (this.oldRow2 === row) {
+        this.oldRowCount2 += 1;
+      }
+      // 切换当前详情表
+      this.$refs.table2.toggleRowExpansion(row);
+      // 打开前关闭上一个详情表
+      if (this.oldRow2 != "") {
+        if (this.oldRow2 != row) {
+          if (this.oldRowCount2 % 2 === 1) {
+            this.$refs.table2.toggleRowExpansion(this.oldRow2);
+          } else {
+            this.oldRowCount2 = 1;
+          }
+        } else {
+          this.oldRow2 = null;
+          return;
+        }
+      }
+      // 重置上一个点击对象
+      this.oldRow2 = row;
+      // 根据销售订单物资中间表id查询物资信息
+      this.axios
+        .post("/api/v1/oms/getOrderMaterialList?orderId=" + row.orderId)
+        .then((res) => {
+          this.tableData2 = res.data.data;
+        });
+    },
+  },
+};
 </script>
 <style lang="scss" scode>
-	.steel_inbound {
-		.sache {
-			padding: 1.25rem 0.375rem;
-			.el-input {
-			width: 20%;
-			margin-right: 1.25rem;
-			}
-		}
-	}
+.steel_inbound {
+  .sache {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
 </style>