Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/components/DilCommonUI/packages/mergeRowTable/src/mergeRowTable.vue

@@ -125,7 +125,9 @@ export default {
   props: {
     // 合并行下标
     columnIndexs: {
-      default: []
+      default() {
+        return []
+      }
     },
     //比对字段
     comparison: {
@@ -190,7 +192,7 @@ export default {
       default: '500px'
     },
     //行展开的key数组，用于控制行是否展开
-    expandRowKeys:[],
+    expandRowKeys: [],
     // 是否启用排序
     sortable: {
       default: 'custom'

src/views/inward/components/inwardBillet/addInwardBillet.vue

@@ -5,113 +5,112 @@
     <div>
       <!-- 用车单位 -->
       <div class="requireUnit form">
-        <el-form  class="demo-form-inline" label-width="80px">
+        <el-form class="demo-form-inline" label-width="80px">
           <el-form-item label="用车单位">
-            <el-input
-              class="inline-input"
-              v-model="requireUnitName"
-              disabled
-            >
+            <el-input class="inline-input" v-model="requireUnitName" disabled>
             </el-input>
           </el-form-item>
           <el-form-item label="炉号">
-            <el-input
-              class="inline-input"
-              v-model="heatNo"
-            >
-            </el-input>
+            <el-input class="inline-input" v-model="heatNo"> </el-input>
           </el-form-item>
           <el-form-item label="需求类型">
-            <el-input
-              class="inline-input"
-              v-model="requirementType"
-              disabled
-            >
+            <el-input class="inline-input" v-model="requirementType" disabled>
             </el-input>
           </el-form-item>
-        <el-form-item label="选择班别">
-            <el-select
-              class="inline-select"
-              v-model="clazz"
-            >
-            <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value">
-            </el-option>
-            </el-select>
-        </el-form-item>
-         <el-form-item label="选择钢种">
-            <el-select
-              class="inline-select"
-              v-model="type"
-            >
-            <el-option
-            v-for="item in options1"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value">
-            </el-option>
+          <el-form-item label="选择班别">
+            <el-select class="inline-select" v-model="clazz">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.value"
+                :value="item.value"
+              >
+              </el-option>
             </el-select>
-        </el-form-item>
-        <el-form-item label="选择规格">
-            <el-select
-              class="inline-select"
-              v-model="model"
-            >
-            <el-option
-            v-for="item in options2"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value">
-            </el-option>
+          </el-form-item>
+          <el-form-item label="选择钢种">
+            <el-select class="inline-select" v-model="type">
+              <el-option
+                v-for="(item, index) in options1"
+                :key="index"
+                :label="item.value"
+                :value="item.value"
+              >
+              </el-option>
             </el-select>
-        </el-form-item>
-        <!-- 车辆我设为多选了，我觉得会省事，他们应该不希望每台车都做一次 -->
-        <el-form-item label="选择车辆">
-            <el-select
-              class="inline-select"
-              v-model="capacityId"
-              multiple
-            >
-            <el-option
-            v-for="item in optionsCapacity"
-            :key="item.capacityId"
-            :label="item.capacityNumber"
-            :value="item.capacityId">
-            </el-option>
+          </el-form-item>
+          <el-form-item label="选择规格">
+            <el-select class="inline-select" v-model="model">
+              <el-option
+                v-for="(item, index) in options2"
+                :key="index"
+                :label="item.value"
+                :value="item.value"
+              >
+              </el-option>
             </el-select>
-        </el-form-item>
-        <el-form-item label="选择装货点">
-            <el-select
-              class="inline-select"
-              v-model="loadPoint"
-            >
-            <el-option
-            v-for="item in optionsLoad"
-            :key="item.warehouseId"
-            :label="item.warehouseName"
-            :value="item.warehouseId">
-            </el-option>
+          </el-form-item>
+          <el-form-item label="选择装货点">
+            <el-select class="inline-select" v-model="loadPoint">
+              <el-option
+                v-for="item in optionsLoad"
+                :key="item.warehouseId"
+                :label="item.warehouseName"
+                :value="item.warehouseId"
+              >
+              </el-option>
             </el-select>
-        </el-form-item>
-        <el-form-item label="选择卸货点">
-            <el-select
-              class="inline-select"
-              v-model="unloadPoint"
-            >
-            <el-option
-            v-for="item in optionsUnload"
-            :key="item.warehouseId"
-            :label="item.warehouseName"
-            :value="item.warehouseId">
-            </el-option>
+          </el-form-item>
+          <el-form-item label="选择卸货点">
+            <el-select class="inline-select" v-model="unloadPoint">
+              <el-option
+                v-for="item in optionsUnload"
+                :key="item.warehouseId"
+                :label="item.warehouseName"
+                :value="item.warehouseId"
+              >
+              </el-option>
             </el-select>
-        </el-form-item>
+          </el-form-item>
         </el-form>
       </div>
-    
+      <div>
+        <el-button type="primary" @click="resetCapacity">
+          重置车辆信息
+        </el-button>
+      </div>
+      <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>
     </div>
     <div class="button-box">
       <el-button type="primary" @click="makeSure">确认新增</el-button>
@@ -124,84 +123,113 @@
 import PageTitle from '@/components/Page/Title'
 import { sjTime } from '@/utils/sharedJsFile'
 import { getCookie } from '@/utils/util.js'
-import { checkTel } from '@/utils/validator.js'
-import returnResultVue from '../offsetSteel/truckTransport/returnResult.vue'
 export default {
   components: { PageTitle },
   data() {
     return {
-        requireUnitId:null,
-        requireUnitName:null,
-        heatNo:null,
-        requirementType:"计重",
-        clazz:null,
-        type:null,
-        model:null,
-        capacityId:null,
-        loadPoint:null,
-        unloadPoint:null,
-        options: [{
-            value:"甲"
-        },{
-            value:"乙"
-        },{
-            value:"丙"
+      requireUnitId: null,
+      requireUnitName: null,
+      heatNo: null,
+      requirementType: '计重',
+      clazz: null,
+      type: null,
+      model: null,
+      capacityId: null,
+      loadPoint: null,
+      unloadPoint: null,
+      options: [
+        {
+          value: '甲'
+        },
+        {
+          value: '乙'
+        },
+        {
+          value: '丙'
         }
-        ],
-        options1: [{
-            value:"Q215"
-        },{
-            value:"HPB300"
-        },{
-            value:"HRB400E"
-        },{
-            value:"HRB400"
-        },{
-            value:"HRB500"
-        },{
-            value:"HRB500E"
-        },{
-            value:"HRB600"
+      ],
+      options1: [
+        {
+          value: 'Q215'
+        },
+        {
+          value: 'HPB300'
+        },
+        {
+          value: 'HRB400E'
+        },
+        {
+          value: 'HRB400'
+        },
+        {
+          value: 'HRB500'
+        },
+        {
+          value: 'HRB500E'
+        },
+        {
+          value: 'HRB600'
         }
-        ],
-        options2: [{
-            value:"Φ16"
-        },{
-            value:"Φ6.5"
-        },{
-            value:"Φ6"
-        },{
-            value:"Φ8"
-        },{
-            value:"Φ10"
-        },{
-            value:"Φ12"
-        },{
-            value:"Φ14"
-        },{
-            value:"Φ16"
-        },{
-            value:"Φ36"
-        },{
-            value:"Φ40"
+      ],
+      options2: [
+        {
+          value: 'Φ16'
+        },
+        {
+          value: 'Φ6.5'
+        },
+        {
+          value: 'Φ6'
+        },
+        {
+          value: 'Φ8'
+        },
+        {
+          value: 'Φ10'
+        },
+        {
+          value: 'Φ12'
+        },
+        {
+          value: 'Φ14'
+        },
+        {
+          value: 'Φ16'
+        },
+        {
+          value: 'Φ36'
+        },
+        {
+          value: 'Φ40'
         }
-        ],
-        capacityArr:['场S74348','场S74976','场S73321','场S16586','场S00859'],
-        optionsCapacity:[],
-        optionsLoad:[],
-        optionsUnload:[],
+      ],
+      tableTop: [
+        {
+          prop: 'capacityNumber',
+          label: '车牌号'
+        }
+      ],
+      selectionList: [],
+      optionsLoad: [],
+      optionsUnload: []
     }
   },
-  mounted(){
-    this.getRequireUnit();
-    this.getLoadPoint();
-    this.getUnloadPoint();
-    this.getCapacity();
+  mounted() {
+    this.getRequireUnit()
+    this.getLoadPoint()
+    this.getUnloadPoint()
+    this.getCapacity()
   },
   methods: {
+    resetCapacity() {
+      this.getCapacity()
+    },
+    deleteRow(index) {
+      this.selectionList.splice(index, 1)
+    },
     //获取炼钢厂连铸车间
-    getRequireUnit(){
-        this.axios
+    getRequireUnit() {
+      this.axios
         .post('/api/v1/uc/getRequireUnitName?index=炼钢厂连铸车间')
         .then(res => {
           if (res.data.code == '200') {
@@ -211,67 +239,75 @@ export default {
         })
     },
     //查询装货点
-    getLoadPoint(){
-        this.axios
+    getLoadPoint() {
+      this.axios
         .post('/api/v1/uc/getUnloadingMesByLike?apiId=374&index=连铸车间')
         .then(res => {
           if (res.data.code == '200') {
-            this.optionsLoad=res.data.data.list;
-            this.loadPoint=parseInt(this.optionsLoad[0].warehouseId);
+            this.optionsLoad = res.data.data.list
+            this.loadPoint = parseInt(this.optionsLoad[0].warehouseId)
           }
         })
     },
     //查询卸货点
-    getUnloadPoint(){
-        this.axios
-        .post('/api/v1/uc/getUnloadingMesByLike?apiId=374',{
-            warehouseName:['一棒车间','高线车间']
+    getUnloadPoint() {
+      this.axios
+        .post('/api/v1/uc/getUnloadingMesByLike?apiId=374', {
+          warehouseName: ['一棒车间', '高线车间']
         })
         .then(res => {
           if (res.data.code == '200') {
-            this.optionsUnload=res.data.data.list;
+            this.optionsUnload = res.data.data.list
           }
         })
     },
     //查询车牌号
-    getCapacity(){
-        this.axios
-        .post('/api/v1/uc/getCapacityByLike?index=S')
+    getCapacity() {
+      this.axios
+        .post(
+          '/api/v1/uc/getAllCapacityByCarrierLike?apiId=429&con=钢坯&carrierSsoId=1024042523359842304'
+        )
         .then(res => {
           if (res.data.code == '200') {
             //过滤
-            this.optionsCapacity = res.data.data.filter(function (x) {
-                return x in this.capacityArr;
-            });
+            this.selectionList = res.data.data.list
+            // console.log(res.data.data.list)
           }
         })
     },
     // 新增
     makeSure() {
-      let map={
-        requireUnitId:this.requireUnitId,
-        heatNo:this.heatNo,
-        requirementType:"计重",
-        clazz:this.clazz,
-        type:this.type,
-        model:this.model,
-        capacityId:this.capacityId,
-        loadPoint:this.loadPoint,
-        unloadPoint:this.unloadPoint,
+      let map = {
+        requirementShipperId: this.requireUnitId,
+        heatNo: this.heatNo,
+        requirementType: '计重',
+        clazz: this.clazz,
+        requirementType: this.type,
+        model: this.model,
+        requirementPlatformId: this.loadPoint,
+        requirementUnloadUnitId: this.unloadPoint,
+        capacityList: this.selectionList
       }
-      console.log("map:",map);
-      if(!map.requireUnitId || !map.heatNo || !map.requirementType || !map.clazz || !map.type || !map.model || !map.loadPoint || !map.unloadPoint || !map.capacityId || map.capacityId.length<=0){
-        this.$message.warning("每项都为必填！");
-        return;
+      console.log('map:', map)
+      if (
+        !map.requireUnitId ||
+        !map.heatNo ||
+        !map.requirementType ||
+        !map.clazz ||
+        !map.type ||
+        !map.model ||
+        !map.loadPoint ||
+        !map.unloadPoint ||
+        map.capacityList.length <= 0
+      ) {
+        this.$message.warning('每项都为必填！')
+        return
       }
       //提交
-      this.axios
-        .post('',map)
-        .then(res => {
-          if (res.data.code == '200') {
-            
-          }
-        })
+      this.axios.post('', map).then(res => {
+        if (res.data.code == '200') {
+        }
+      })
     },
     // 返回
     cancel() {

src/views/inward/components/inwardBillet/inwardBillet.vue

@@ -1,6 +1,6 @@
 // 内转钢坯界面，留作备用
 <template>
-  <div class="inwardRequirement">
+  <div class="inwardBilletRequirement">
     <div class="sache">
       <el-input placeholder="请输入内容" v-model="inputText" clearable>
       </el-input>
@@ -79,28 +79,28 @@
   </div>
 </template>
 <script>
-import { getCookie } from "@/utils/util.js";
-import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from '@/utils/util.js'
+import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
       inputText: null,
-      orgCode: "",
+      orgCode: '',
       startTime: null,
       endTime: null,
       first: {
         // first请求数据的地址
-        requestUrl: "",
-        selectionType: "select",
-        columnIndexs:[0,1,2,6,7,8,9,22],
-        comparison: "requirementNumber",
+        requestUrl: '',
+        selectionType: 'select',
+        columnIndexs: [0, 1, 2, 6, 7, 8, 9, 22],
+        comparison: 'requirementNumber',
         mapList: []
       },
       second: {
-        columnIndexs:[0,1,5,6,7,8,9,21],
-        comparison: "requirementNumber",
+        columnIndexs: [0, 1, 5, 6, 7, 8, 9, 21],
+        comparison: 'requirementNumber',
         // second请求数据的地址
-        requestUrl: ""
+        requestUrl: ''
       },
       tableData: [],
       tableData1: [
@@ -108,187 +108,187 @@ export default {
           materialCount: 100
         }
       ],
-      activeName: "first"
-    };
+      activeName: 'first'
+    }
   },
   created() {
     if (
-      getCookie("orgCode") == "dagangadmin" ||
-      getCookie("orgCode") == "zidonghuabu"
+      getCookie('orgCode') == 'dagangadmin' ||
+      getCookie('orgCode') == 'zidonghuabu'
     ) {
       this.first.requestUrl =
-        "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0";
+        '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0'
       this.second.requestUrl =
-        "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1";
+        '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1'
     } else {
       this.first.requestUrl =
-        "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" +
-        getCookie("orgCode");
+        '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=' +
+        getCookie('orgCode')
       this.second.requestUrl =
-        "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" +
-        getCookie("orgCode");
+        '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=' +
+        getCookie('orgCode')
     }
   },
   mounted() {},
   methods: {
     onclick() {
-      let orgCode = null;
-      let startTime = null;
-      let endTime = null;
+      let orgCode = null
+      let startTime = null
+      let endTime = null
       if (this.startTime && this.endTime) {
-        startTime = sjTime(this.startTime);
-        endTime = sjTime(this.endTime);
+        startTime = sjTime(this.startTime)
+        endTime = sjTime(this.endTime)
       }
       if (
-        getCookie("orgCode") != "dagangadmin" &&
-        getCookie("orgCode") != "zidonghuabu"
+        getCookie('orgCode') != 'dagangadmin' &&
+        getCookie('orgCode') != 'zidonghuabu'
       ) {
-        orgCode = getCookie("orgCode");
+        orgCode = getCookie('orgCode')
       }
-      if (this.activeName == "first") {
+      if (this.activeName == 'first') {
         this.first.requestUrl =
-          "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" +
+          '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=' +
           orgCode +
-          "&index=" +
+          '&index=' +
           this.inputText +
-          "&startTime=" +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&i=" +
-          new Date();
+          '&i=' +
+          new Date()
       } else {
         this.second.requestUrl =
-          "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" +
+          '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=' +
           orgCode +
-          "&index=" +
+          '&index=' +
           this.inputText +
-          "&startTime=" +
+          '&startTime=' +
           startTime +
-          "&endTime=" +
+          '&endTime=' +
           endTime +
-          "&i=" +
-          new Date();
+          '&i=' +
+          new Date()
       }
     },
     //查看需求下面的运单
     getRequirementOrder(scope) {
-      this.$router.push("/getRequirementOrder/" + scope.row.requirementId);
+      this.$router.push('/getRequirementOrder/' + scope.row.requirementId)
     },
     handleClick(tab, event) {
-      this.getRequestUrl();
+      this.getRequestUrl()
     },
     getRequestUrl() {
       if (
-        getCookie("orgCode") == "dagangadmin" ||
-        getCookie("orgCode") == "zidonghuabu"
+        getCookie('orgCode') == 'dagangadmin' ||
+        getCookie('orgCode') == 'zidonghuabu'
       ) {
         this.first.requestUrl =
-          "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&i=" +
-          new Date();
+          '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&i=' +
+          new Date()
         this.second.requestUrl =
-          "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&i=" +
-          new Date();
+          '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&i=' +
+          new Date()
       } else {
         this.first.requestUrl =
-          "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=" +
-          getCookie("orgCode") +
-          "&i=" +
-          new Date();
+          '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=0&orgCode=' +
+          getCookie('orgCode') +
+          '&i=' +
+          new Date()
         this.second.requestUrl =
-          "/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=" +
-          getCookie("orgCode") +
-          "&i=" +
-          new Date();
+          '/api/v1/ams/getTruckRequirementList?apiId=207&requirementStatus=1&orgCode=' +
+          getCookie('orgCode') +
+          '&i=' +
+          new Date()
       }
     },
     selectionChange(selection) {
-      this.first.mapList = selection;
+      this.first.mapList = selection
     },
     toInsert2() {
-      this.$router.push("/addInwardBillet");
+      this.$router.push('/addInwardBillet')
     },
     updateRequirement(scope) {
-      this.$router.push("/updateRequirement/" + scope.row.requirementId);
+      this.$router.push('/updateRequirement/' + scope.row.requirementId)
     },
     deleteRequirement(scope) {
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('是否删除', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
         center: true
       })
         .then(() => {
           this.axios
             .post(
-              "/api/v1/ams/deleteTruckRequirement/" + scope.row.requirementId
+              '/api/v1/ams/deleteTruckRequirement/' + scope.row.requirementId
             )
             .then(res => {
               if (res.data.code == 200) {
                 this.$message({
-                  type: "success",
-                  message: "删除成功!"
-                });
-                this.getRequestUrl();
+                  type: 'success',
+                  message: '删除成功!'
+                })
+                this.getRequestUrl()
               } else {
                 this.$message({
-                  message: "删除失败",
-                  type: "warning"
-                });
+                  message: '删除失败',
+                  type: 'warning'
+                })
               }
-            });
+            })
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "删除操作已取消!"
-          });
-        });
+            type: 'info',
+            message: '删除操作已取消!'
+          })
+        })
     },
     Issue() {
-      console.log(this.first.mapList);
+      console.log(this.first.mapList)
       if (this.first.mapList.length == 0) {
-        this.$message.warning("请选择需求");
-        return;
+        this.$message.warning('请选择需求')
+        return
       }
       // 权限控制，判断用户是否属于轧钢厂下面的车间
-      this.$confirm("是否下发", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm('是否下发', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
         center: true
       })
         .then(() => {
           this.axios
-            .post("/api/v1/ams/downRequirement", this.first.mapList)
+            .post('/api/v1/ams/downRequirement', this.first.mapList)
             .then(res => {
               if (res.data.code == 200) {
                 this.$message({
-                  type: "success",
-                  message: "下发成功!"
-                });
-                this.getRequestUrl();
-                this.activeName = "second";
+                  type: 'success',
+                  message: '下发成功!'
+                })
+                this.getRequestUrl()
+                this.activeName = 'second'
               } else {
                 this.$message({
-                  message: "下发失败",
-                  type: "warning"
-                });
+                  message: '下发失败',
+                  type: 'warning'
+                })
               }
-            });
+            })
         })
         .catch(() => {
           this.$message({
-            type: "info",
-            message: "取消下发!"
-          });
-        });
+            type: 'info',
+            message: '取消下发!'
+          })
+        })
     }
   }
-};
+}
 </script>
 <style lang="scss" scoped>
-.inwardRequirement {
+.inwardBilletRequirement {
   margin-top: 20px;
   margin-left: 20px;
   .sache {

src/views/inward/router/index.js

@@ -1,687 +1,708 @@
-import Vue from "vue";
-import Router from "vue-router";
+import Vue from 'vue'
+import Router from 'vue-router'
 
-import routerBefore from "@/config/routerBefore.js";
+import routerBefore from '@/config/routerBefore.js'
 
 // 主要
-import main from "@/components/main.vue";
+import main from '@/components/main.vue'
 // 系统配置管理
 //运输预约--提出需求
-import requirement from "@/views/inward/components/truckAppoint/requirement.vue";
+import requirement from '@/views/inward/components/truckAppoint/requirement.vue'
 // 没有提出需求页面
-import requirementOther from "@/views/inward/components/truckAppoint/requirementOther.vue";
+import requirementOther from '@/views/inward/components/truckAppoint/requirementOther.vue'
 //运输预约--提出采购内转需求
-import purInwardRequirement from "@/views/inward/components/truckAppoint/purInwardRequirement.vue";
+import purInwardRequirement from '@/views/inward/components/truckAppoint/purInwardRequirement.vue'
 //运输预约--制定计划
-import truckAppointPlan from "@/views/inward/components/truckAppoint/plan.vue";
+import truckAppointPlan from '@/views/inward/components/truckAppoint/plan.vue'
 //运输订单--新增采购内转派单
-import addPurInwardOrder from "@/views/inward/components/truckOrder/addPurInwardOrder.vue";
+import addPurInwardOrder from '@/views/inward/components/truckOrder/addPurInwardOrder.vue'
 //运输订单--采购内转派单
-import purInwardTruckOrder from "@/views/inward/components/truckOrder/purInwardTruckOrder.vue";
+import purInwardTruckOrder from '@/views/inward/components/truckOrder/purInwardTruckOrder.vue'
 
 //运输预约--制定内转钢材到异地库计划
-import RailPlan from "@/views/inward/components/truckAppoint/RailPlan.vue";
+import RailPlan from '@/views/inward/components/truckAppoint/RailPlan.vue'
 //运输订单--分解计划
-import truckOrderPlan from "@/views/inward/components/truckOrder/plan.vue";
+import truckOrderPlan from '@/views/inward/components/truckOrder/plan.vue'
 //运输订单--分解内转异地库计划
-import truckOrderRailPlan from "@/views/inward/components/truckOrder/RailPlan.vue";
+import truckOrderRailPlan from '@/views/inward/components/truckOrder/RailPlan.vue'
 //运输订单--分派计划
-import dispatchPlan from "@/views/inward/components/truckOrder/dispatchPlan.vue";
+import dispatchPlan from '@/views/inward/components/truckOrder/dispatchPlan.vue'
 //内转钢材到异地库--汽车运输--进厂作业
-import enFactoryResult from "@/views/inward/components/offsetSteel/truckTransport/enFactoryResult.vue";
+import enFactoryResult from '@/views/inward/components/offsetSteel/truckTransport/enFactoryResult.vue'
 //内转钢材到异地库--汽车运输--计皮作业
-import tareWeightResult from "@/views/inward/components/offsetSteel/truckTransport/tareWeightResult.vue";
+import tareWeightResult from '@/views/inward/components/offsetSteel/truckTransport/tareWeightResult.vue'
 //内转钢材到异地库--汽车运输--装车作业
-import loadTruckResult from "@/views/inward/components/offsetSteel/truckTransport/loadTruckResult.vue";
+import loadTruckResult from '@/views/inward/components/offsetSteel/truckTransport/loadTruckResult.vue'
 //内转钢材到异地库--汽车运输--质检作业
-import qualityResult from "@/views/inward/components/offsetSteel/truckTransport/qualityResult.vue";
+import qualityResult from '@/views/inward/components/offsetSteel/truckTransport/qualityResult.vue'
 //内转钢材到异地库--汽车运输--计毛作业
-import grossWeightResult from "@/views/inward/components/offsetSteel/truckTransport/grossWeightResult.vue";
+import grossWeightResult from '@/views/inward/components/offsetSteel/truckTransport/grossWeightResult.vue'
 //内转钢材到异地库--汽车运输--出厂作业
-import outFactory from "@/views/inward/components/offsetSteel/truckTransport/outFactory.vue";
+import outFactory from '@/views/inward/components/offsetSteel/truckTransport/outFactory.vue'
 //内转钢材到异地库--汽车运输--收货作业
-import truckReceiptResult from "@/views/inward/components/offsetSteel/truckTransport/truckReceiptResult.vue";
+import truckReceiptResult from '@/views/inward/components/offsetSteel/truckTransport/truckReceiptResult.vue'
 //内转钢材到异地库--火车运输--请车作业
-import wagonPlease from "@/views/inward/components/offsetSteel/truckTrain/wagonPlease.vue";
+import wagonPlease from '@/views/inward/components/offsetSteel/truckTrain/wagonPlease.vue'
 
 //内转钢材到异地库--分派订单
-import saleTruckOrder from "@/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckOrder.vue";
-import saleTruckPreview from "@/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckPreview.vue";
+import saleTruckOrder from '@/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckOrder.vue'
+import saleTruckPreview from '@/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckPreview.vue'
 
 //内转钢材到异地库--火车运输--批车作业
-import wagonApprove from "@/views/inward/components/offsetSteel/truckTrain/wagonApprove.vue";
+import wagonApprove from '@/views/inward/components/offsetSteel/truckTrain/wagonApprove.vue'
 //内转钢材到异地库--火车运输--装车作业
-import wagonLoad from "@/views/inward/components/offsetSteel/truckTrain/wagonLoad.vue";
+import wagonLoad from '@/views/inward/components/offsetSteel/truckTrain/wagonLoad.vue'
 //内转钢材到异地库--火车运输--卸车作业
-import wagonUnLoad from "@/views/inward/components/offsetSteel/truckTrain/wagonUnLoad.vue";
+import wagonUnLoad from '@/views/inward/components/offsetSteel/truckTrain/wagonUnLoad.vue'
 //内转进口矿/国产矿/燃料--达州站-厂内料场--火车卸车
-import trainUnload from "@/views/inward/components/inwardImport/daZhou/trainUnload.vue";
+import trainUnload from '@/views/inward/components/inwardImport/daZhou/trainUnload.vue'
 //内转进口矿/国产矿/燃料--达州站-厂内料场--汽车装车
-import truckLoad from "@/views/inward/components/inwardImport/daZhou/truckLoad.vue";
+import truckLoad from '@/views/inward/components/inwardImport/daZhou/truckLoad.vue'
 //内转进口矿/国产矿/燃料--达州站-厂内料场--进厂作业
-import daZhouEnFactoryResult from "@/views/inward/components/inwardImport/daZhou/enFactoryResult.vue";
+import daZhouEnFactoryResult from '@/views/inward/components/inwardImport/daZhou/enFactoryResult.vue'
 //内转进口矿/国产矿/燃料--达州站-厂内料场--计毛作业
-import daZhouGrossWeightResult from "@/views/inward/components/inwardImport/daZhou/grossWeightResult.vue";
+import daZhouGrossWeightResult from '@/views/inward/components/inwardImport/daZhou/grossWeightResult.vue'
 //内转进口矿/国产矿/燃料--达州站-厂内料场--卸货作业
-import unload from "@/views/inward/components/inwardImport/daZhou/unload.vue";
+import unload from '@/views/inward/components/inwardImport/daZhou/unload.vue'
 //内转进口矿/国产矿/燃料--达州站-厂内料场--质检作业
-import daZhouQualityResult from "@/views/inward/components/inwardImport/daZhou/qualityResult.vue";
+import daZhouQualityResult from '@/views/inward/components/inwardImport/daZhou/qualityResult.vue'
 //内转进口矿/国产矿/燃料--达州站-厂内料场--计皮作业
-import daZhouTareWeightResult from "@/views/inward/components/inwardImport/daZhou/tareWeightResult.vue";
+import daZhouTareWeightResult from '@/views/inward/components/inwardImport/daZhou/tareWeightResult.vue'
 //内转进口矿/国产矿/燃料--达州站-厂内料场--收货作业
-import receipt from "@/views/inward/components/inwardImport/daZhou/receipt.vue";
+import receipt from '@/views/inward/components/inwardImport/daZhou/receipt.vue'
 //内转进口矿/国产矿/燃料--达州站-厂内料场--出厂作业
-import daZhouOutFactory from "@/views/inward/components/inwardImport/daZhou/outFactory.vue";
+import daZhouOutFactory from '@/views/inward/components/inwardImport/daZhou/outFactory.vue'
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--铁路专用线卸货
-import trainLineUnload from "@/views/inward/components/inwardImport/oldAreaRailScale/trainLineUnload.vue";
+import trainLineUnload from '@/views/inward/components/inwardImport/oldAreaRailScale/trainLineUnload.vue'
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--质检作业
-import oldAreaRailScaleQualityResult from "@/views/inward/components/inwardImport/oldAreaRailScale/qualityResult.vue";
+import oldAreaRailScaleQualityResult from '@/views/inward/components/inwardImport/oldAreaRailScale/qualityResult.vue'
 //内转进口矿-轨道衡厂内料场-质检作业
-import oldAreaEnfactoryResult from "@/views/inward/components/inwardImport/oldAreaRailScale/enFactory.vue";
+import oldAreaEnfactoryResult from '@/views/inward/components/inwardImport/oldAreaRailScale/enFactory.vue'
 //内转老区轨道衡进厂
-import oldAreaOutfactoryResult from "@/views/inward/components/inwardImport/oldAreaRailScale/outFactory.vue";
+import oldAreaOutfactoryResult from '@/views/inward/components/inwardImport/oldAreaRailScale/outFactory.vue'
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--汽车装货
-import oldAreaRailScaleTruckLoad from "@/views/inward/components/inwardImport/oldAreaRailScale/truckLoad.vue";
+import oldAreaRailScaleTruckLoad from '@/views/inward/components/inwardImport/oldAreaRailScale/truckLoad.vue'
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--计毛作业
-import oldAreaRailScaleGrossWeightResult from "@/views/inward/components/inwardImport/oldAreaRailScale/grossWeightResult.vue";
+import oldAreaRailScaleGrossWeightResult from '@/views/inward/components/inwardImport/oldAreaRailScale/grossWeightResult.vue'
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--卸货作业
-import oldAreaRailScaleUnload from "@/views/inward/components/inwardImport/oldAreaRailScale/unload.vue";
+import oldAreaRailScaleUnload from '@/views/inward/components/inwardImport/oldAreaRailScale/unload.vue'
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--计皮作业
-import oldAreaRailScaleTareWeightResult from "@/views/inward/components/inwardImport/oldAreaRailScale/tareWeightResult.vue";
+import oldAreaRailScaleTareWeightResult from '@/views/inward/components/inwardImport/oldAreaRailScale/tareWeightResult.vue'
 //内转进口矿/国产矿/燃料--老区轨道衡-厂内料场--收货作业
-import oldAreaRailScaleReceipt from "@/views/inward/components/inwardImport/oldAreaRailScale/receipt.vue";
+import oldAreaRailScaleReceipt from '@/views/inward/components/inwardImport/oldAreaRailScale/receipt.vue'
 //内转进口矿/国产矿/燃料--内转厂内物资--进厂作业
-import inwardFactoryEnFactoryResult from "@/views/inward/components/inwardFactory/enFactoryResult.vue";
+import inwardFactoryEnFactoryResult from '@/views/inward/components/inwardFactory/enFactoryResult.vue'
 //内转进口矿/国产矿/燃料--内转厂内物资--装车作业
-import inwardFactoryTruckLoad from "@/views/inward/components/inwardFactory/truckLoad.vue";
+import inwardFactoryTruckLoad from '@/views/inward/components/inwardFactory/truckLoad.vue'
 //内转进口矿/国产矿/燃料--内转厂内物资--计量作业
-import inwardFactoryTareWeightResult from "@/views/inward/components/inwardFactory/tareWeightResult.vue";
+import inwardFactoryTareWeightResult from '@/views/inward/components/inwardFactory/tareWeightResult.vue'
 //内转进口矿/国产矿/燃料--内转厂内物资--卸车作业
-import inwardFactoryUnload from "@/views/inward/components/inwardFactory/unload.vue";
+import inwardFactoryUnload from '@/views/inward/components/inwardFactory/unload.vue'
 //内转进口矿/国产矿/燃料--内转厂内物资--出厂作业
-import inwardFactoryOutFactory from "@/views/inward/components/inwardFactory/outFactory.vue";
+import inwardFactoryOutFactory from '@/views/inward/components/inwardFactory/outFactory.vue'
 //内转进口矿/国产矿/燃料--内转厂内物资--计时作业
-import timeTaskResult from "@/views/inward/components/inwardFactory/timeTaskResult.vue";
+import timeTaskResult from '@/views/inward/components/inwardFactory/timeTaskResult.vue'
 //内转进口矿/国产矿/燃料--内转厂内物资--计数作业
-import countResult from "@/views/inward/components/inwardFactory/countResult.vue";
+import countResult from '@/views/inward/components/inwardFactory/countResult.vue'
 //内转进口矿/国产矿/燃料--内转厂内物资--包月作业
-import monthResult from "@/views/inward/components/inwardFactory/monthResult.vue";
+import monthResult from '@/views/inward/components/inwardFactory/monthResult.vue'
 //倒库作业
-import reverseResult from "@/views/inward/components/inwardFactory/reverseResult.vue";
+import reverseResult from '@/views/inward/components/inwardFactory/reverseResult.vue'
 //**************************************跳转界面**************************************/
 
 //新增采购内转需求
-import addRequirement from "@/views/inward/components/truckAppoint/addRequirement.vue";
+import addRequirement from '@/views/inward/components/truckAppoint/addRequirement.vue'
 //新增厂内内转需求
-import addRequirement2 from "@/views/inward/components/truckAppoint/addRequirement2.vue";
+import addRequirement2 from '@/views/inward/components/truckAppoint/addRequirement2.vue'
 //修改需求
-import updateRequirement from "@/views/inward/components/truckAppoint/updateRequirement.vue";
+import updateRequirement from '@/views/inward/components/truckAppoint/updateRequirement.vue'
 //新增计划
-import addPlan from "@/views/inward/components/truckAppoint/addPlan.vue";
+import addPlan from '@/views/inward/components/truckAppoint/addPlan.vue'
 //修改计划
-import updatePlan from "@/views/inward/components/truckAppoint/updatePlan.vue";
+import updatePlan from '@/views/inward/components/truckAppoint/updatePlan.vue'
 //新增内转钢材到异地库计划
-import addRailPlan from "@/views/inward/components/truckAppoint/addRailPlan.vue";
+import addRailPlan from '@/views/inward/components/truckAppoint/addRailPlan.vue'
 //计划分解
-import decomposePlan from "@/views/inward/components/truckOrder/decomposePlan.vue";
+import decomposePlan from '@/views/inward/components/truckOrder/decomposePlan.vue'
 
 //查看计划运单详情
-import getPlanOrder from "@/views/inward/components/truckOrder/getPlanOrder.vue";
+import getPlanOrder from '@/views/inward/components/truckOrder/getPlanOrder.vue'
 //查看需求运单详情
-import getRequirementOrder from "@/views/inward/components/truckAppoint/getRequirementOrder.vue";
+import getRequirementOrder from '@/views/inward/components/truckAppoint/getRequirementOrder.vue'
 //内转异地库计划分解
-import decomposeRailPlan from "@/views/inward/components/truckOrder/decomposeRailPlan.vue";
+import decomposeRailPlan from '@/views/inward/components/truckOrder/decomposeRailPlan.vue'
 //请车作业新增
-import addWagonPlease from "@/views/inward/components/offsetSteel/truckTrain/addWagonPlease.vue";
+import addWagonPlease from '@/views/inward/components/offsetSteel/truckTrain/addWagonPlease.vue'
 //请车作业修改
-import editWagonPlease from "@/views/inward/components/offsetSteel/truckTrain/editWagonPlease.vue";
+import editWagonPlease from '@/views/inward/components/offsetSteel/truckTrain/editWagonPlease.vue'
 //批车作业新增
-import addApproveWagonPlease from "@/views/inward/components/offsetSteel/truckTrain/addApproveWagonPlease.vue";
+import addApproveWagonPlease from '@/views/inward/components/offsetSteel/truckTrain/addApproveWagonPlease.vue'
 //新增批车作业
-import editApproveWagonPlease from "@/views/inward/components/offsetSteel/truckTrain/editApproveWagonPlease.vue";
+import editApproveWagonPlease from '@/views/inward/components/offsetSteel/truckTrain/editApproveWagonPlease.vue'
 //装车作业新增
-import addWagonLoad from "@/views/inward/components/offsetSteel/truckTrain/addWagonLoad.vue";
+import addWagonLoad from '@/views/inward/components/offsetSteel/truckTrain/addWagonLoad.vue'
 //装车作业修改
-import editWagonLoad from "@/views/inward/components/offsetSteel/truckTrain/editWagonLoad.vue";
+import editWagonLoad from '@/views/inward/components/offsetSteel/truckTrain/editWagonLoad.vue'
 //车皮卸车作业新增
-import addWagonUnLoad from "@/views/inward/components/offsetSteel/truckTrain/addWagonUnLoad.vue";
+import addWagonUnLoad from '@/views/inward/components/offsetSteel/truckTrain/addWagonUnLoad.vue'
 //车皮卸车作业修改
-import editWagonUnLoad from "@/views/inward/components/offsetSteel/truckTrain/editWagonUnLoad.vue";
+import editWagonUnLoad from '@/views/inward/components/offsetSteel/truckTrain/editWagonUnLoad.vue'
 //新增汽车装货
-import addTruckLoad from "@/views/inward/components/inwardImport/daZhou/addTruckLoad.vue";
+import addTruckLoad from '@/views/inward/components/inwardImport/daZhou/addTruckLoad.vue'
 //修改汽车装货
-import updateTruckLoad from "@/views/inward/components/inwardImport/daZhou/updateTruckLoad.vue";
+import updateTruckLoad from '@/views/inward/components/inwardImport/daZhou/updateTruckLoad.vue'
 //新增汽车装车
-import oldAreaRailScaleAddTruckLoad from "@/views/inward/components/inwardImport/oldAreaRailScale/addTruckLoad.vue";
+import oldAreaRailScaleAddTruckLoad from '@/views/inward/components/inwardImport/oldAreaRailScale/addTruckLoad.vue'
 //内转厂内物资--新增汽车装货
-import inwardFactoryAddTruckLoad from "@/views/inward/components/inwardFactory/addTruckLoad.vue";
+import inwardFactoryAddTruckLoad from '@/views/inward/components/inwardFactory/addTruckLoad.vue'
 
 //内转结算--纯内转计费详单
-import inwardDetailOrders from "../components/inwardSettlement/detailOrder.vue";
+import inwardDetailOrders from '../components/inwardSettlement/detailOrder.vue'
 //内转结算--采购内转计费详单
-import inwardPurDetailsOrders from "../components/inwardSettlement/purInwardDetailsOrder.vue";
+import inwardPurDetailsOrders from '../components/inwardSettlement/purInwardDetailsOrder.vue'
 //内转结算--计时计费详单
-import inwardTimeDetailsOrders from "../components/inwardSettlement/timeDetailsWeight.vue";
+import inwardTimeDetailsOrders from '../components/inwardSettlement/timeDetailsWeight.vue'
 //内转结算--计数计费详单
-import inwardCountDetailsOrders from "../components/inwardSettlement/countDetailOrder.vue";
+import inwardCountDetailsOrders from '../components/inwardSettlement/countDetailOrder.vue'
 //内转结算--计时和计重计费详单
-import inwardWeightTimeDetailsOrder from "../components/inwardSettlement/inwardAllDetailsOrder.vue";
+import inwardWeightTimeDetailsOrder from '../components/inwardSettlement/inwardAllDetailsOrder.vue'
 
 //继续分解采购内转需求订单
-import addPurInwardOrderCon from "@/views/inward/components/truckOrder/addPurInwardOrderCon";
+import addPurInwardOrderCon from '@/views/inward/components/truckOrder/addPurInwardOrderCon'
 
 //内转火车发运明细
-import platformStockInfo from "@/views/inward/components/offsetSteel/saleSteelTruckOrder/platformStockInfo.vue";
-
+import platformStockInfo from '@/views/inward/components/offsetSteel/saleSteelTruckOrder/platformStockInfo.vue'
 //库存调拨单浏览
-import kucunList from "@/views/inward/components/offsetSteel/saleSteelTruckOrder/kucunList.vue";
-Vue.use(Router);
+import kucunList from '@/views/inward/components/offsetSteel/saleSteelTruckOrder/kucunList.vue'
+
+const inwardBilletRequirement = () =>
+  import('@/views/inward/components/inwardBillet/inwardBillet.vue')
+
+const addInwardBillet = () =>
+  import('@/views/inward/components/inwardBillet/addInwardBillet.vue')
+Vue.use(Router)
 
 const constantRouterMap = [
   {
-    path: "/",
-    name: "main",
+    path: '/',
+    name: 'main',
     meta: {
-      title: "首页",
-      code: "xtpzgl"
+      title: '首页',
+      code: 'xtpzgl'
     },
     component: main,
     redirect: {
-      name: "requirement"
+      name: 'requirement'
     },
     children: [
       {
-        path: "requirement",
-        name: "requirement",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'requirement',
+        name: 'requirement',
+        meta: { code: 'xtpzgl-yhgl' },
         component: requirement
       },
       {
-        path: "requirementOther",
-        name: "requirementOther",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'requirementOther',
+        name: 'requirementOther',
+        meta: { code: 'xtpzgl-yhgl' },
         component: requirementOther
       },
       {
-        path: "purInwardRequirement",
-        name: "purInwardRequirement",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'purInwardRequirement',
+        name: 'purInwardRequirement',
+        meta: { code: 'xtpzgl-yhgl' },
         component: purInwardRequirement
       },
       {
-        path: "truckAppointPlan",
-        name: "truckAppointPlan",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'truckAppointPlan',
+        name: 'truckAppointPlan',
+        meta: { code: 'xtpzgl-yhgl' },
         component: truckAppointPlan
       },
       {
-        path: "purInwardTruckOrder",
-        name: "purInwardTruckOrder",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'purInwardTruckOrder',
+        name: 'purInwardTruckOrder',
+        meta: { code: 'xtpzgl-yhgl' },
         component: purInwardTruckOrder
       },
       {
-        path: "addPurInwardOrder",
-        name: "addPurInwardOrder",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addPurInwardOrder',
+        name: 'addPurInwardOrder',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addPurInwardOrder
       },
       {
-        path: "truckAppointPlan",
-        name: "truckAppointPlan",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'truckAppointPlan',
+        name: 'truckAppointPlan',
+        meta: { code: 'xtpzgl-yhgl' },
         component: truckAppointPlan
       },
       {
-        path: "RailPlan",
-        name: "RailPlan",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'RailPlan',
+        name: 'RailPlan',
+        meta: { code: 'xtpzgl-yhgl' },
         component: RailPlan
       },
       {
-        path: "truckOrderPlan",
-        name: "truckOrderPlan",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'truckOrderPlan',
+        name: 'truckOrderPlan',
+        meta: { code: 'xtpzgl-yhgl' },
         component: truckOrderPlan
       },
       {
-        path: "truckOrderRailPlan",
-        name: "truckOrderRailPlan",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'truckOrderRailPlan',
+        name: 'truckOrderRailPlan',
+        meta: { code: 'xtpzgl-yhgl' },
         component: truckOrderRailPlan
       },
       {
-        path: "dispatchPlan",
-        name: "dispatchPlan",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'dispatchPlan',
+        name: 'dispatchPlan',
+        meta: { code: 'xtpzgl-yhgl' },
         component: dispatchPlan
       },
       {
-        path: "enFactoryResult",
-        name: "enFactoryResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'enFactoryResult',
+        name: 'enFactoryResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: enFactoryResult
       },
       {
-        path: "tareWeightResult",
-        name: "tareWeightResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'tareWeightResult',
+        name: 'tareWeightResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: tareWeightResult
       },
       {
-        path: "loadTruckResult",
-        name: "loadTruckResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'loadTruckResult',
+        name: 'loadTruckResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: loadTruckResult
       },
       {
-        path: "qualityResult",
-        name: "qualityResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'qualityResult',
+        name: 'qualityResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: qualityResult
       },
       {
-        path: "grossWeightResult",
-        name: "grossWeightResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'grossWeightResult',
+        name: 'grossWeightResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: grossWeightResult
       },
       {
-        path: "outFactory",
-        name: "outFactory",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'outFactory',
+        name: 'outFactory',
+        meta: { code: 'xtpzgl-yhgl' },
         component: outFactory
       },
       {
-        path: "truckReceiptResult",
-        name: "truckReceiptResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'truckReceiptResult',
+        name: 'truckReceiptResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: truckReceiptResult
       },
       {
-        path: "wagonPlease",
-        name: "wagonPlease",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'wagonPlease',
+        name: 'wagonPlease',
+        meta: { code: 'xtpzgl-yhgl' },
         component: wagonPlease
       },
       {
-        path: "wagonApprove",
-        name: "wagonApprove",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'wagonApprove',
+        name: 'wagonApprove',
+        meta: { code: 'xtpzgl-yhgl' },
         component: wagonApprove
       },
       {
-        path: "wagonLoad",
-        name: "wagonLoad",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'wagonLoad',
+        name: 'wagonLoad',
+        meta: { code: 'xtpzgl-yhgl' },
         component: wagonLoad
       },
       {
-        path: "wagonUnLoad",
-        name: "wagonUnLoad",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'wagonUnLoad',
+        name: 'wagonUnLoad',
+        meta: { code: 'xtpzgl-yhgl' },
         component: wagonUnLoad
       },
       {
-        path: "trainUnload",
-        name: "trainUnload",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'trainUnload',
+        name: 'trainUnload',
+        meta: { code: 'xtpzgl-yhgl' },
         component: trainUnload
       },
 
       {
-        path: "saleTruckOrder",
-        name: "saleTruckOrder",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'saleTruckOrder',
+        name: 'saleTruckOrder',
+        meta: { code: 'xtpzgl-yhgl' },
         component: saleTruckOrder
       },
       {
-        path: "saleTruckPreview",
-        name: "saleTruckPreview",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'saleTruckPreview',
+        name: 'saleTruckPreview',
+        meta: { code: 'xtpzgl-yhgl' },
         component: saleTruckPreview
       },
       {
-        path: "daZhouEnFactoryResult",
-        name: "daZhouEnFactoryResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'daZhouEnFactoryResult',
+        name: 'daZhouEnFactoryResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: daZhouEnFactoryResult
       },
       {
-        path: "daZhouGrossWeightResult",
-        name: "daZhouGrossWeightResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'daZhouGrossWeightResult',
+        name: 'daZhouGrossWeightResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: daZhouGrossWeightResult
       },
       {
-        path: "unload",
-        name: "unload",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'unload',
+        name: 'unload',
+        meta: { code: 'xtpzgl-yhgl' },
         component: unload
       },
       {
-        path: "daZhouQualityResult",
-        name: "daZhouQualityResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'daZhouQualityResult',
+        name: 'daZhouQualityResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: daZhouQualityResult
       },
       {
-        path: "daZhouTareWeightResult",
-        name: "daZhouTareWeightResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'daZhouTareWeightResult',
+        name: 'daZhouTareWeightResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: daZhouTareWeightResult
       },
       {
-        path: "receipt",
-        name: "receipt",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'receipt',
+        name: 'receipt',
+        meta: { code: 'xtpzgl-yhgl' },
         component: receipt
       },
       {
-        path: "daZhouOutFactory",
-        name: "daZhouOutFactory",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'daZhouOutFactory',
+        name: 'daZhouOutFactory',
+        meta: { code: 'xtpzgl-yhgl' },
         component: daZhouOutFactory
       },
       {
-        path: "trainLineUnload",
-        name: "trainLineUnload",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'trainLineUnload',
+        name: 'trainLineUnload',
+        meta: { code: 'xtpzgl-yhgl' },
         component: trainLineUnload
       },
       {
-        path: "oldAreaRailScaleQualityResult",
-        name: "oldAreaRailScaleQualityResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'oldAreaRailScaleQualityResult',
+        name: 'oldAreaRailScaleQualityResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: oldAreaRailScaleQualityResult
       },
       {
-        path: "oldAreaOutfactoryResult",
-        name: "oldAreaOutfactoryResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'oldAreaOutfactoryResult',
+        name: 'oldAreaOutfactoryResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: oldAreaOutfactoryResult
       },
       {
-        path: "oldAreaEnfactoryResult",
-        name: "oldAreaEnfactoryResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'oldAreaEnfactoryResult',
+        name: 'oldAreaEnfactoryResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: oldAreaEnfactoryResult
       },
       {
-        path: "oldAreaRailScaleTruckLoad",
-        name: "oldAreaRailScaleTruckLoad",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'oldAreaRailScaleTruckLoad',
+        name: 'oldAreaRailScaleTruckLoad',
+        meta: { code: 'xtpzgl-yhgl' },
         component: oldAreaRailScaleTruckLoad
       },
       {
-        path: "oldAreaRailScaleGrossWeightResult",
-        name: "oldAreaRailScaleGrossWeightResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'oldAreaRailScaleGrossWeightResult',
+        name: 'oldAreaRailScaleGrossWeightResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: oldAreaRailScaleGrossWeightResult
       },
       {
-        path: "oldAreaRailScaleUnload",
-        name: "oldAreaRailScaleUnload",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'oldAreaRailScaleUnload',
+        name: 'oldAreaRailScaleUnload',
+        meta: { code: 'xtpzgl-yhgl' },
         component: oldAreaRailScaleUnload
       },
       {
-        path: "oldAreaRailScaleTareWeightResult",
-        name: "oldAreaRailScaleTareWeightResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'oldAreaRailScaleTareWeightResult',
+        name: 'oldAreaRailScaleTareWeightResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: oldAreaRailScaleTareWeightResult
       },
       {
-        path: "oldAreaRailScaleReceipt",
-        name: "oldAreaRailScaleReceipt",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'oldAreaRailScaleReceipt',
+        name: 'oldAreaRailScaleReceipt',
+        meta: { code: 'xtpzgl-yhgl' },
         component: oldAreaRailScaleReceipt
       },
       {
-        path: "inwardFactoryEnFactoryResult",
-        name: "inwardFactoryEnFactoryResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'inwardFactoryEnFactoryResult',
+        name: 'inwardFactoryEnFactoryResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: inwardFactoryEnFactoryResult
       },
       {
-        path: "inwardFactoryTruckLoad",
-        name: "inwardFactoryTruckLoad",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'inwardFactoryTruckLoad',
+        name: 'inwardFactoryTruckLoad',
+        meta: { code: 'xtpzgl-yhgl' },
         component: inwardFactoryTruckLoad
       },
       {
-        path: "inwardFactoryTareWeightResult",
-        name: "inwardFactoryTareWeightResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'inwardFactoryTareWeightResult',
+        name: 'inwardFactoryTareWeightResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: inwardFactoryTareWeightResult
       },
       {
-        path: "inwardFactoryUnload",
-        name: "inwardFactoryUnload",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'inwardFactoryUnload',
+        name: 'inwardFactoryUnload',
+        meta: { code: 'xtpzgl-yhgl' },
         component: inwardFactoryUnload
       },
       {
-        path: "inwardFactoryOutFactory",
-        name: "inwardFactoryOutFactory",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'inwardFactoryOutFactory',
+        name: 'inwardFactoryOutFactory',
+        meta: { code: 'xtpzgl-yhgl' },
         component: inwardFactoryOutFactory
       },
       {
-        path: "timeTaskResult",
-        name: "timeTaskResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'timeTaskResult',
+        name: 'timeTaskResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: timeTaskResult
       },
       {
-        path: "countResult",
-        name: "countResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'countResult',
+        name: 'countResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: countResult
       },
       {
-        path: "monthResult",
-        name: "monthResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'monthResult',
+        name: 'monthResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: monthResult
       },
       {
-        path: "reverseResult",
-        name: "reverseResult",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'reverseResult',
+        name: 'reverseResult',
+        meta: { code: 'xtpzgl-yhgl' },
         component: reverseResult
       },
       /*****************************************跳转页面*****************************************/
       {
-        path: "addRequirement",
-        name: "addRequirement",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addRequirement',
+        name: 'addRequirement',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addRequirement
       },
       {
-        path: "addRequirement2",
-        name: "addRequirement2",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addRequirement2',
+        name: 'addRequirement2',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addRequirement2
       },
       {
-        path: "updateRequirement/:requirementId",
-        name: "updateRequirement",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'updateRequirement/:requirementId',
+        name: 'updateRequirement',
+        meta: { code: 'xtpzgl-yhgl' },
         component: updateRequirement
       },
       {
-        path: "addPlan",
-        name: "addPlan",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addPlan',
+        name: 'addPlan',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addPlan
       },
       {
-        path: "updatePlan/:planId",
-        name: "updatePlan",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'updatePlan/:planId',
+        name: 'updatePlan',
+        meta: { code: 'xtpzgl-yhgl' },
         component: updatePlan
       },
       {
-        path: "addRailPlan",
-        name: "addRailPlan",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addRailPlan',
+        name: 'addRailPlan',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addRailPlan
       },
       {
-        path: "decomposePlan/:planId",
-        name: "decomposePlan",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'decomposePlan/:planId',
+        name: 'decomposePlan',
+        meta: { code: 'xtpzgl-yhgl' },
         component: decomposePlan
       },
       {
-        path: "getPlanOrder/:planId",
-        name: "getPlanOrder",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'getPlanOrder/:planId',
+        name: 'getPlanOrder',
+        meta: { code: 'xtpzgl-yhgl' },
         component: getPlanOrder
       },
       {
-        path: "getRequirementOrder/:requirementId",
-        name: "getRequirementOrder",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'getRequirementOrder/:requirementId',
+        name: 'getRequirementOrder',
+        meta: { code: 'xtpzgl-yhgl' },
         component: getRequirementOrder
       },
       {
-        path: "decomposeRailPlan/:dayPlanId",
-        name: "decomposeRailPlan",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'decomposeRailPlan/:dayPlanId',
+        name: 'decomposeRailPlan',
+        meta: { code: 'xtpzgl-yhgl' },
         component: decomposeRailPlan
       },
       {
-        path: "addWagonPlease",
-        name: "addWagonPlease",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addWagonPlease',
+        name: 'addWagonPlease',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addWagonPlease
       },
       {
-        path: "editWagonPlease/:resultId",
-        name: "editWagonPlease",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'editWagonPlease/:resultId',
+        name: 'editWagonPlease',
+        meta: { code: 'xtpzgl-yhgl' },
         component: editWagonPlease
       },
       {
-        path: "addApproveWagonPlease",
-        name: "requaddApproveWagonPleaseirement",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addApproveWagonPlease',
+        name: 'requaddApproveWagonPleaseirement',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addApproveWagonPlease
       },
       {
-        path: "editApproveWagonPlease/:resultId",
-        name: "editApproveWagonPlease",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'editApproveWagonPlease/:resultId',
+        name: 'editApproveWagonPlease',
+        meta: { code: 'xtpzgl-yhgl' },
         component: editApproveWagonPlease
       },
       {
-        path: "addWagonLoad",
-        name: "addWagonLoad",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addWagonLoad',
+        name: 'addWagonLoad',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addWagonLoad
       },
       {
-        path: "editWagonLoad/:resultId",
-        name: "editWagonLoad",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'editWagonLoad/:resultId',
+        name: 'editWagonLoad',
+        meta: { code: 'xtpzgl-yhgl' },
         component: editWagonLoad
       },
       {
-        path: "addWagonUnLoad",
-        name: "addWagonUnLoad",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addWagonUnLoad',
+        name: 'addWagonUnLoad',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addWagonUnLoad
       },
       {
-        path: "editWagonUnLoad/:unloadingId",
-        name: "editWagonUnLoad",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'editWagonUnLoad/:unloadingId',
+        name: 'editWagonUnLoad',
+        meta: { code: 'xtpzgl-yhgl' },
         component: editWagonUnLoad
       },
       {
-        path: "addTruckLoad",
-        name: "addTruckLoad",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addTruckLoad',
+        name: 'addTruckLoad',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addTruckLoad
       },
       {
-        path: "updateTruckLoad/:resultId",
-        name: "updateTruckLoad",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'updateTruckLoad/:resultId',
+        name: 'updateTruckLoad',
+        meta: { code: 'xtpzgl-yhgl' },
         component: updateTruckLoad
       },
       {
-        path: "oldAreaRailScaleAddTruckLoad",
-        name: "oldAreaRailScaleAddTruckLoad",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'oldAreaRailScaleAddTruckLoad',
+        name: 'oldAreaRailScaleAddTruckLoad',
+        meta: { code: 'xtpzgl-yhgl' },
         component: oldAreaRailScaleAddTruckLoad
       },
       {
-        path: "inwardFactoryAddTruckLoad",
-        name: "inwardFactoryAddTruckLoad",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'inwardFactoryAddTruckLoad',
+        name: 'inwardFactoryAddTruckLoad',
+        meta: { code: 'xtpzgl-yhgl' },
         component: inwardFactoryAddTruckLoad
       },
       {
-        path: "inwardDetailOrders",
-        name: "inwardDetailOrders",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'inwardDetailOrders',
+        name: 'inwardDetailOrders',
+        meta: { code: 'xtpzgl-yhgl' },
         component: inwardDetailOrders
       },
       {
-        path: "inwardCountDetailsOrders",
-        name: "inwardCountDetailsOrders",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'inwardCountDetailsOrders',
+        name: 'inwardCountDetailsOrders',
+        meta: { code: 'xtpzgl-yhgl' },
         component: inwardCountDetailsOrders
       },
       {
-        path: "inwardTimeDetailsOrders",
-        name: "inwardTimeDetailsOrders",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'inwardTimeDetailsOrders',
+        name: 'inwardTimeDetailsOrders',
+        meta: { code: 'xtpzgl-yhgl' },
         component: inwardTimeDetailsOrders
       },
       {
-        path: "inwardPurDetailsOrders",
-        name: "inwardPurDetailsOrders",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'inwardPurDetailsOrders',
+        name: 'inwardPurDetailsOrders',
+        meta: { code: 'xtpzgl-yhgl' },
         component: inwardPurDetailsOrders
       },
       {
-        path: "inwardWeightTimeDetailsOrder",
-        name: "inwardWeightTimeDetailsOrder",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'inwardWeightTimeDetailsOrder',
+        name: 'inwardWeightTimeDetailsOrder',
+        meta: { code: 'xtpzgl-yhgl' },
         component: inwardWeightTimeDetailsOrder
       },
       {
-        path: "addPurInwardOrderCon/:planId",
-        name: "addPurInwardOrderCon",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'addPurInwardOrderCon/:planId',
+        name: 'addPurInwardOrderCon',
+        meta: { code: 'xtpzgl-yhgl' },
         component: addPurInwardOrderCon
       },
       {
-        path: "platformStockInfo",
-        name: "platformStockInfo",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'platformStockInfo',
+        name: 'platformStockInfo',
+        meta: { code: 'xtpzgl-yhgl' },
         component: platformStockInfo
       },
       {
-        path: "kucunList",
-        name: "kucunList",
-        meta: { code: "xtpzgl-yhgl" },
+        path: 'kucunList',
+        name: 'kucunList',
+        meta: { code: 'xtpzgl-yhgl' },
         component: kucunList
+      },
+      {
+        path: 'inwardBilletRequirement',
+        name: 'inwardBilletRequirement',
+        meta: {
+          code: 'xtpzgl-yhgl'
+        },
+        component: inwardBilletRequirement
+      },
+      {
+        path: 'addInwardBillet',
+        name: 'addInwardBillet',
+        meta: {
+          code: 'xtpzgl-yhgl'
+        },
+        component: addInwardBillet
       }
     ]
   }
-];
+]
 
 const router = new Router({
   routes: constantRouterMap
-});
+})
 //  before
-routerBefore(router, constantRouterMap);
+routerBefore(router, constantRouterMap)
 
-export default router;
+export default router
 //  constantRouterMap
-export const routes = constantRouterMap;
+export const routes = constantRouterMap

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

@@ -2,19 +2,20 @@
 <template>
   <div class="steelDetailsOrder">
     <div class="sache">
+      <label class="el-form-item__label" style="width: auto;">订单日期：</label>
       <el-date-picker
         v-model="startTime"
-        type="datetime"
+        type="date"
         placeholder="选择日期"
-        style="width:220px"
+        style="width:200px"
       >
       </el-date-picker>
       <span>至</span>
       <el-date-picker
         v-model="endTime"
-        type="datetime"
+        type="date"
         placeholder="选择日期"
-        style="width:220px"
+        style="width:200px"
       >
       </el-date-picker>
       <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
@@ -30,8 +31,13 @@
       <el-tabs v-model="activeName">
         <!-- 未结算 -->
         <el-tab-pane label="未结算" name="first">
-          <dilTable v-bind.sync="options1" ref="excelDom">
-            <el-table-column fixed="right" label="操作" width="145">
+          <mergeRowTable
+            v-bind.sync="options1"
+            ref="excelDom"
+            :stripe="false"
+            :isPagination="false"
+          >
+            <el-table-column fixed="right" label="操作" width="120">
               <template slot-scope="scope">
                 <el-button
                   v-if="ssoId == null"
@@ -42,17 +48,11 @@
                 >
               </template>
             </el-table-column>
-          </dilTable>
+          </mergeRowTable>
         </el-tab-pane>
         <!-- 已结算 -->
         <el-tab-pane label="已结算" name="second">
-          <dilTable v-bind.sync="options2">
-            <!-- <el-table-column fixed="right" label="操作" width="40">
-                <template slot-scope="scope">
-                  <el-button type="text" size="mini" @click="getclick(scope)">查看</el-button>
-                </template>
-            </el-table-column> -->
-          </dilTable>
+          <mergeRowTable v-bind.sync="options2"> </mergeRowTable>
         </el-tab-pane>
       </el-tabs>
     </div>
@@ -98,24 +98,6 @@
           ></dilTable>
         </vue-scorll>
       </div>
-      <!--        <el-form-item label="新详单地址" :label-width="formLabelWidth">
-          <el-input
-            style="width:250px"
-            v-model="newAddress"
-            disabled
-          ></el-input>
-          <label>现单价</label>
-          <el-input
-            style="width:100px"
-            v-model="newPriceValue"
-            disabled
-          ></el-input>
-          <el-button type="primary" placeholder="()" @click="select"
-            >浏览</el-button
-          >
-        </el-form-item>-->
-
-      <!-- class="dialog-footer" slot="footer"-->
       <div class="opreation">
         <el-button @click="dialogFormVisible = false">取 消</el-button>
         <el-button type="primary" @click="makeSure">确 定</el-button>
@@ -131,6 +113,7 @@ export default {
   data() {
     return {
       aaadrawer: false,
+      pageSize: 100,
       ops: {
         vuescroll: {},
         scrollPanel: {},
@@ -157,14 +140,8 @@ export default {
       //省市县(区)查询值
       addresText: null,
       noSettleDetailsColumn: [],
-      //达钢的干基
-      DaDryBasis: null,
-      //九江收货的干基
-      JiuDryBasis: null,
       //单价
       Fee: null,
-      //途损费
-      damageFee: null,
       //加载
       selectLineLoading: false,
       input: '',
@@ -174,7 +151,9 @@ export default {
       detailsId: null,
       options1: {
         // first请求数据的地址
-        requestUrl: ''
+        requestUrl: '',
+        comparison: 'orderId',
+        columnIndexs: [0, 2, 3, 4, 5, 7, 13, 14, 16, 17, 18]
       },
       options2: {
         // second请求数据的地址
@@ -204,7 +183,9 @@ export default {
       // addressText:null,
       //缓存当前选中的运输单价
       priceMap: {},
-      formLabelWidth: '125px'
+      formLabelWidth: '125px',
+      orderId: null,
+      placeId: null
     }
   },
   created() {
@@ -276,8 +257,6 @@ export default {
       var title = tableTitle
       let tHeader = []
       let filterVal = []
-      console.log('进入了导出')
-      console.log(columnData)
       columnData.forEach(e1 => {
         if (tHeader.indexOf(e1.label) === -1) {
           tHeader.push(e1.label)
@@ -408,9 +387,13 @@ export default {
     },
     //修改详单单价
     priceValueUpdate(row) {
+      this.orderId = row.orderId
       this.originalAddress = row.realAddress
       this.originalPriceValue = row.priceValue
       this.detailsId = row.detailsId
+
+      this.Address.requestUrl =
+        '/api/v1/ams/getAddressDeliveryAddress?apiId=511&i=' + new Date()
       this.dialogFormVisible = true
     },
     //运输订单点击浏览的事件
@@ -451,8 +434,9 @@ export default {
       if (this.place != null) {
         this.place = null
       }
-      ;(this.address = val.address), (this.addressId = val.addressId)
-
+      this.placeId = val.placeId
+      this.address = val.address
+      this.addressId = val.addressId
       this.priceId = val.priceid
       // this.priceMap = {};
       // this.priceMap = val;
@@ -465,29 +449,82 @@ export default {
       } else {
         this.dialogFormVisible = false
         let mapValue = {
+          orderId: this.orderId,
           detailsId: this.detailsId,
-          priceId: this.priceId
+          priceId: this.priceId,
+          placeId: this.placeId
         }
         //是否确定修改详单地址!
-        this.$confirm('是否确定修改详单地址', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
+        this.$confirm('确定修改', '提示', {
+          confirmButtonText: '仅修改单价',
+          cancelButtonText: '修改下货地址和单价',
+          distinguishCancelAndClose: true,
           type: 'warning',
           center: true
         })
           .then(() => {
             //初始化修改详单地址对话框的信息
-            ;(this.newPriceValue = null),
-              (this.newAddress = null),
-              (this.address = null),
-              (this.addresText = null),
-              (this.addressId = null),
-              (this.priceId = null),
+            this.newPriceValue = null
+            this.newAddress = null
+            this.address = null
+            this.addresText = null
+            this.addressId = null
+            this.priceId = null
+            this.axios
+              .post('/api/v1/bms/updateDetailsOrder', mapValue)
+              .then(res => {
+                if (res.data.code == '0') {
+                  this.$message.success('修改详单单价成功!')
+                  let startTime = null
+                  let endTime = null
+                  let carrierSsoId = null
+                  if (getCookie('orgCode') == 'chengyunshang') {
+                    carrierSsoId = getCookie('userId')
+                  }
+                  if (this.startTime && this.endTime) {
+                    startTime = sjTime(this.startTime)
+                    endTime = sjTime(this.endTime)
+                  }
+                  //重置未结算详单表单信息
+                  this.options1.requestUrl =
+                    '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=' +
+                    this.input +
+                    '&startTime=' +
+                    startTime +
+                    '&endTime=' +
+                    endTime +
+                    '&status=0' +
+                    '&i=' +
+                    new Date()
+                } else {
+                  this.$message.error('修改详单单价失败,请联系管理员!')
+                }
+              })
+          })
+          .catch(action => {
+            if (action === 'cancel') {
+              mapValue.updatePlace = 1
+              this.newPriceValue = null
+              this.newAddress = null
+              this.address = null
+              this.addresText = null
+              this.addressId = null
+              this.priceId = null
               this.axios
                 .post('/api/v1/bms/updateDetailsOrder', mapValue)
                 .then(res => {
                   if (res.data.code == '0') {
-                    this.$message.success('修改详单单价成功!')
+                    this.$message.success('修改详单单价和地址成功!')
+                    let startTime = null
+                    let endTime = null
+                    let carrierSsoId = null
+                    if (getCookie('orgCode') == 'chengyunshang') {
+                      carrierSsoId = getCookie('userId')
+                    }
+                    if (this.startTime && this.endTime) {
+                      startTime = sjTime(this.startTime)
+                      endTime = sjTime(this.endTime)
+                    }
                     //重置未结算详单表单信息
                     this.options1.requestUrl =
                       '/api/v1/bms/getSteelTruckDetailsOrder?apiId=507&orderType=1&con=' +
@@ -499,16 +536,10 @@ export default {
                       '&status=0' +
                       '&i=' +
                       new Date()
-                  } else {
-                    this.$message.error('修改详单单价失败,请联系管理员!')
                   }
                 })
-          })
-          .catch(() => {
-            this.$message({
-              type: 'info',
-              message: '取消修改详单单价!'
-            })
+            }
+            //初始化修改详单地址对话框的信息
           })
       }
     }

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

@@ -116,6 +116,7 @@
         @row-click="rowClick"
         :cell-style="cellStyle"
         @filter-change="filterChange"
+        :lazy="true"
       >
         <el-table-column
           width="50"
@@ -137,6 +138,7 @@
           prop="saleOrderStatus"
           label="销售订单状态"
           width="100px"
+          align="center"
           show-overflow-tooltip
         >
         </el-table-column>
@@ -154,9 +156,10 @@
         <el-table-column
           prop="areaName"
           label="销售片区"
-          width="160px"
+          width="150px"
           align="center"
-          show-overflow-tooltip
+          column-key="saleAreaList"
+          :filters="filterSaleAreaList"
         >
         </el-table-column>
         <el-table-column
@@ -183,13 +186,12 @@
         </el-table-column>
         <el-table-column
           prop="materialName"
+          column-key="materialNameList"
           label="物资名称"
           align="center"
           width="150px"
           sortable
-          show-overflow-tooltip
           :filters="filtermaterialNameList"
-          column-key="materialNameList"
         >
         </el-table-column>
         <el-table-column
@@ -770,7 +772,6 @@ import { sjTime, isVehicleNumber } from '@/utils/sharedJsFile'
 import { getCookie } from '@/utils/util.js'
 import PathView from './mapTest.vue'
 import currentLocation from './currentLocation.vue'
-import newNoticeVue from '../../../sale/components/dilNotice/newNotice.vue'
 export default {
   components: {
     PathView,
@@ -937,6 +938,7 @@ export default {
       filterCarrierList: [],
       filterCapacityList: [],
       filtermaterialNameList: [],
+      filterSaleAreaList: [],
       filterMap: {}
     }
   },
@@ -1011,6 +1013,18 @@ export default {
       ) {
         delete this.filterMap.consigneeNameList
       }
+      if (
+        typeof obj.saleAreaList != 'undefined' &&
+        obj.saleAreaList.length > 0
+      ) {
+        this.filterMap.saleAreaList = obj.saleAreaList
+      }
+      if (
+        typeof obj.saleAreaList != 'undefined' &&
+        obj.saleAreaList.length == 0
+      ) {
+        delete this.filterMap.saleAreaList
+      }
       // if (obj)
       this.onclick(this.filterMap)
     },
@@ -1040,10 +1054,18 @@ export default {
         .filter(e => {
           return e != null
         })
+      let saleAreaList = this.tableData
+        .map(e => {
+          return e.areaName
+        })
+        .filter(e => {
+          return e != null
+        })
       this.filterConsigneeList = []
       this.filterCarrierList = []
       this.filterCapacityList = []
       this.filtermaterialNameList = []
+      this.filterSaleAreaList = []
       Array.from(new Set(consigneeNameList)).forEach(e => {
         let map = {}
         map.text = e
@@ -1068,6 +1090,12 @@ export default {
         map.value = e
         this.filtermaterialNameList.push(map)
       })
+      Array.from(new Set(saleAreaList)).forEach(e => {
+        let map = {}
+        map.text = e
+        map.value = e
+        this.filterSaleAreaList.push(map)
+      })
     },
     cellStyle({ row, column, rowIndex, columnIndex }) {
       if (
@@ -2096,6 +2124,9 @@ export default {
   .table {
     margin-left: 20px;
     margin-top: 20px;
+    .el-tooltip {
+      width: auto !important;
+    }
     ::-webkit-scrollbar {
       // width: 20px;
       height: 20px;