affd

build/utils.js

@@ -16,7 +16,7 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
 // let devModules = ['index','inward']
-let devModules = ['index','RMS','appoint','statisticalReport']
+let devModules = ['index','appoint','sale']
 // let devModules = ['index','sale']
 if (pathSrc.indexOf('node_modules') > -1) {
     devModules = require('../../../cors.js').devModules;

config/index.js

@@ -64,9 +64,9 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   "/api/v1": {
-    // target: "http://192.168.1.113:8080",
+    target: "http://192.168.1.113:8080",
     // target: "http://172.16.33.166:8080",
-    target: "http://localhost:8080",
+    // target: "http://localhost:8080",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"
@@ -74,6 +74,8 @@ let proxyTable = {
   },
   "/views/api/v1": {
     target: "http://172.16.33.166:8080",
+    // target: "http://192.168.1.109:8080",
+    ws: true,
     pathRewrite: {
       "^/views/api/v1": "/api/v1"
     }

src/views/RMS/components/addInwardContractMaterial.vue

@@ -0,0 +1,75 @@
+<template>
+  <!-- 添加港口信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <div class="form-box">
+      <dil-form :formId="382" v-model="form1" ref="from1"></dil-form>
+    </div>
+    <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";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {}
+    };
+  },
+  mounted() {},
+  methods: {
+    makeSure() {
+      console.log(this.form1);
+      this.axios
+        .post("/api/v1/rms/insertMaterialType", this.form1)
+        .then(res => {
+          if (res.data.code == 0) {
+            this.$message.success("新增成功");
+            this.$router.go(-1);
+          } else {
+            this.$message.warning("请重试！");
+            this.$router.go(0);
+          }
+        });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    }
+  }
+};
+</script>
+<style lang="scss">
+.button-box {
+  display: flex;
+  justify-content: center;
+  .el-button {
+    width: 80px;
+    margin-right: 10px;
+  }
+}
+.form-box {
+  display: flex;
+  justify-content: center;
+  .el-form-item {
+    display: flex;
+    justify-content: center;
+    .el-form-item__label {
+      display: flex;
+      align-items: center;
+    }
+    .el-form-item__content {
+      .el-input {
+        .el-input__inner {
+          width: 250px;
+        }
+      }
+    }
+  }
+}
+</style>

src/views/RMS/components/addMaterial.vue

@@ -2,36 +2,45 @@
   <!-- 添加物资信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-     <div class="form-box" style="margin-right: 10rem">
-        <dil-form :formId="326" v-model="form1" ref="from1"></dil-form>
-      </div>
-        <div class="form-box f1">
-          <el-form :inline="true" :model="formInline" class="demo-form-inline">
-  <div class="disableBox">
-  <el-form-item>
-    <el-input v-model="materialTypeName" disabled>  
-    </el-input>
-  </el-form-item>
-  <el-form-item>
-    <el-button type="primary" @click="drawer = true">物资种类</el-button>
-  </el-form-item>
-  </div>
-    </el-form>
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="326" v-model="form1" ref="from1"></dil-form>
+    </div>
+    <div class="form-box f1">
+      <el-form :inline="true" :model="formInline">
+        <div class="disableBox">
+          <el-form-item>
+            <el-input v-model="materialTypeName" disabled> </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="openDrawer">物资种类</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
     </div>
-    <el-drawer
-      :visible.sync="drawer"
-      :direction="direction"
-      :before-close="handleClose">
+    <div class="eldrawer">
+      <el-drawer
+        :visible.sync="drawer"
+        :direction="direction"
+        :before-close="handleClose"
+      >
         <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><dilTable v-bind.sync="options" @radio-change="currentRadioChange" ></dilTable></div>
-</el-drawer>
+          placeholder="请输入内容"
+          v-model="inputText"
+          clearable
+          style="width:250px"
+        >
+        </el-input>
+        <el-button type="primary" class="btn" @click="onclick">
+          <i class="el-icon-search"></i>查询
+        </el-button>
+        <div>
+          <dilTable
+            v-bind.sync="options"
+            @radio-change="currentRadioChange"
+          ></dilTable>
+        </div>
+      </el-drawer>
+    </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -48,58 +57,58 @@ export default {
     return {
       form1: {},
       drawer: false,
-      direction: 'rtl',
-      inputText:"",
-      materialTypeId:"",
-      options:{
-        requestUrl:"/api/v1/rms/getMaterialTypeList?apiId=376",
-        selectionType:"radio",
-        mapList:[]
-      }
+      direction: "rtl",
+      inputText: "",
+      materialTypeId: "",
+      materialTypeName: null,
+      options: {
+        requestUrl: "/api/v1/rms/getMaterialTypeList?apiId=376",
+        selectionType: "radio"
+      },
+      mapList: {}
     };
   },
   mounted() {},
   methods: {
-      currentRadioChange(selection){
-      this.mapList=selection,
+    currentRadioChange(selection) {
+      console.log(selection);
+      this.mapList = selection;
       this.materialTypeId = this.mapList.materialTypeId;
-      console.log(this.mapList)
-      this.materialTypeName=this.mapList.materialTypeName
+      console.log(this.mapList);
+      this.materialTypeName = this.mapList.materialTypeName;
+    },
+    openDrawer() {
+      this.options.requestUrl =
+        "/api/v1/rms/getMaterialTypeList?apiId=376&i=" + new Date();
+      this.drawer = true;
+      this.inputText = null;
     },
-    onclick(){
-      this.options.requestUrl="/api/v1/rms/getMaterialTypeList?apiId=376&con=" +this.inputText;
+    onclick() {
+      this.options.requestUrl =
+        "/api/v1/rms/getMaterialTypeList?apiId=376&con=" + this.inputText;
     },
-     makeSure() {  
-       
+    makeSure() {
       let RmsMaterial = {
-        materialName:this.form1.materialName,
-        materialSpecification:this.form1.materialSpecification,
-        materialModel:this.form1.materialModel,
-        materialTypeId:this.materialTypeId,
-        unitOfMeasureId:this.form1.unitOfMeasureId,
-        materialTheoreticalWeight:this.form1.materialTheoreticalWeight,
+        materialName: this.form1.materialName,
+        materialSpecification: this.form1.materialSpecification,
+        materialModel: this.form1.materialModel,
+        materialTypeId: this.materialTypeId,
+        unitOfMeasureId: this.form1.unitOfMeasureId,
+        materialTheoreticalWeight: this.form1.materialTheoreticalWeight
       };
-    if(
-        RmsMaterial.materialName==null
-      )this.$message.error("存在空值！");
+      if (RmsMaterial.materialName == null) this.$message.error("存在空值！");
       else
-      this.axios
-        .post(
-          "/api/v1/rms/insertMaterial",
-           RmsMaterial
-        )
-        .then((res) => {
+        this.axios.post("/api/v1/rms/insertMaterial", RmsMaterial).then(res => {
           if (res.data.code == 200) {
             this.$message({
               type: "success",
-              message: "新增成功!",
+              message: "新增成功!"
             });
             // this.$refs.table.refreshData();
             this.$router.go(-1);
-          }else if(res.data.code == '201'){
-            this.$message.warning("该物资已存在")
-          } 
-          else {
+          } else if (res.data.code == "201") {
+            this.$message.warning("该物资已存在");
+          } else {
             this.$message.error("新增失败");
           }
           //this.$refs['table'].resetField();
@@ -108,27 +117,27 @@ export default {
     // 取消
     cancel() {
       this.$router.go(-1);
-    },
+    }
   },
-   handleClose(done) {
-        this.$confirm('确认关闭？')
-          .then(_ => {
-            done();
-          })
-          .catch(_ => {});
-      }
+  handleClose(done) {
+    this.$confirm("确认关闭？")
+      .then(_ => {
+        done();
+      })
+      .catch(_ => {});
+  }
 };
 </script>
-<style lang='scss' >
- .button-box{
-    display: flex;
-    justify-content: center;
-    .el-button{
-      width: 80px;
-      margin-right: 10px;
-    }
+<style lang="scss">
+.button-box {
+  display: flex;
+  justify-content: center;
+  .el-button {
+    width: 80px;
+    margin-right: 10px;
   }
-.disableBox{
+}
+.disableBox {
   display: flex;
   text-align: center;
   align-items: center;
@@ -143,7 +152,7 @@ export default {
 .input {
   margin-left: 90px;
 }
-.common{
+.common {
   font-weight: 700;
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen,
     Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
@@ -151,35 +160,39 @@ export default {
   cursor: default;
   color: #2c3e50;
 }
-.f1{
+.f1 {
+  display: flex;
+  justify-content: center;
+  align-items: center;
   margin-top: -2.5rem;
   margin-left: 22.3rem;
 }
-.f11{
+.f11 {
   margin-top: -3rem;
   // margin-left: 29rem;
 }
-.f2{
+.f2 {
   margin-top: -2.5rem;
   margin-left: 20.7rem;
 }
-.f3{
+.f3 {
   margin-top: -2.5rem;
   margin-left: 25rem;
 }
-.form-box{
+.form-box {
   display: flex;
   justify-content: center;
-  .el-form-item{
+  align-items: center;
+  .el-form-item {
     display: flex;
     justify-content: center;
-    .el-form-item__label{
+    .el-form-item__label {
       display: flex;
       align-items: center;
     }
-    .el-form-item__content{
-      .el-input{
-        .el-input__inner{
+    .el-form-item__content {
+      .el-input {
+        .el-input__inner {
           width: 250px;
         }
       }

src/views/RMS/components/addPort.vue

@@ -2,9 +2,9 @@
   <!-- 添加港口信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-     <div class="form-box" >
-        <dil-form :formId="271" v-model="form1" ref="from1"></dil-form>
-      </div>
+    <div class="form-box">
+      <dil-form :formId="271" v-model="form1" ref="from1"></dil-form>
+    </div>
     <div class="button-box">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="makeSure">确定</el-button>
@@ -18,78 +18,70 @@ export default {
   components: { PageTitle },
   data() {
     return {
-        portName:'',
+      portName: "",
       form1: {},
-      value: undefined,
+      value: undefined
     };
   },
   mounted() {},
-  methods: {                
-     makeSure() {
-        console.log(this.form1)
-    //   let RmsCapacity = {
-          
-    //   };
-       let RmsCapacity=this.form1;
-      console.log(RmsCapacity)
-      if (
-        RmsCapacity.portName==null||
-        RmsCapacity.portTypeId==null
-        
-      ) this.$message.error("存在空值！");
-      else 
-      this.axios
-        .post(
-          "/api/v1/rms/insertPort",
-           RmsCapacity
-        )
-        .then((res) => {
+  methods: {
+    makeSure() {
+      console.log(this.form1);
+      //   let RmsCapacity = {
+
+      //   };
+      let RmsCapacity = this.form1;
+      console.log(RmsCapacity);
+      if (RmsCapacity.portName == null || RmsCapacity.portTypeId == null)
+        this.$message.error("存在空值！");
+      else
+        this.axios.post("/api/v1/rms/insertPort", RmsCapacity).then(res => {
           if (res.data.code == 200) {
             this.$message({
               type: "success",
-              message: "新增成功!",
+              message: "新增成功!"
             });
             // this.$refs.table.refreshData();
             this.$router.go(-1);
           } else {
             this.$message.error("新增失败,可能存在重复！");
           }
-         // this.$refs['table'].resetField();
+          // this.$refs['table'].resetField();
         });
     },
     // 取消
     cancel() {
       this.$router.go(-1);
-    },
-  },
+    }
+  }
 };
 </script>
-<style lang='scss' >
- .button-box{
-    display: flex;
-    justify-content: center;
-    .el-button{
-      width: 80px;
-      margin-right: 10px;
-    }
+<style lang="scss">
+.button-box {
+  display: flex;
+  justify-content: center;
+  .el-button {
+    width: 80px;
+    margin-right: 10px;
   }
-.form-box{
+}
+.form-box {
   display: flex;
   justify-content: center;
-  .el-form-item{
+  .el-form-item {
     display: flex;
     justify-content: center;
-    .el-form-item__label{
+    .el-form-item__label {
       display: flex;
       align-items: center;
     }
-    .el-form-item__content{
-      .el-input{
-        .el-input__inner{
+    .el-form-item__content {
+      .el-input {
+        .el-input__inner {
           width: 250px;
         }
       }
     }
   }
 }
-</style>
+</style>

src/views/RMS/components/editMaterial.vue

@@ -2,8 +2,7 @@
   <!-- 修改物资信息 -->
   <div id="contractDetails">
     <page-title>编辑</page-title>
-    <div class="main">
-    </div>
+    <div class="main"></div>
     <div class="contractTitle">
       <div class="form-box">
         <div class="form-one">
@@ -11,7 +10,37 @@
         </div>
       </div>
     </div>
-    
+    <div class="form-box f1">
+      <el-form :inline="true" :model="formInline">
+        <div class="disableBox">
+          <el-form-item>
+            <el-input v-model="materialTypeName" disabled> </el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" @click="openDrawer">物资种类</el-button>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
+    <div class="eldrawer">
+      <el-drawer
+        :visible.sync="drawer"
+        :direction="direction"
+        :before-close="handleClose"
+      >
+        <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>
+          <dilTable
+            v-bind.sync="options"
+            @radio-change="currentRadioChange"
+          ></dilTable>
+        </div>
+      </el-drawer>
+    </div>
     <div class="button-box">
       <el-button @click="onClickCancel">返回</el-button>
       <el-button type="primary" @click="onClickConfirm">确认</el-button>
@@ -26,25 +55,41 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      inputText: null,
+      materialTypeId: null,
+      drawer: false,
       form1: {},
+      mapList: {},
+      materialTypeName: null,
+      options: {
+        requestUrl: "",
+        selectionType: "radio"
+      }
     };
   },
- 
+
   mounted() {
-      console.log(this.$route)
     this.information();
   },
-  methods: {  
+  methods: {
+    openDrawer() {
+      this.drawer = true;
+      this.options.requestUrl =
+        "/api/v1/rms/getMaterialTypeList?apiId=376&i=" + new Date();
+      this.inputText = null;
+    },
+    currentRadioChange(selection) {
+      this.mapList = selection;
+      this.materialTypeId = this.mapList.materialTypeId;
+      this.materialTypeName = this.mapList.materialTypeName;
+    },
     information() {
       //编辑
       this.axios
-        .post(
-          "/api/v1/rms/getMaterialById/" +
-            this.$route.params.materialId
-        )
-        .then((res) => {
-            console.log(res)
-          res.data.data.forEach((e) => {
+        .post("/api/v1/rms/getMaterialById/" + this.$route.params.materialId)
+        .then(res => {
+          console.log(res);
+          res.data.data.forEach(e => {
             this.form1 = e;
             console.log(e);
             console.log(this.form1);
@@ -56,54 +101,44 @@ export default {
     onClickCancel() {
       this.$router.go(-1);
     },
+    onclick() {
+      this.options.requestUrl =
+        "/api/v1/rms/getMaterialTypeList?apiId=376&con=" + this.inputText;
+    },
     // 确认
     onClickConfirm() {
-      console.log(this.form1)
+      console.log(this.form1);
       let RmsMaterial = {
-        materialId:this.form1.materialId,
-        materialCode:this.form1.materialCode,
-        materialName:this.form1.materialName,
-        materialSpecification:this.form1.materialSpecification,
-        materialModel:this.form1.materialModel,
-        materialTypeId:this.form1.materialTypeId,
-        unitOfMeasureId:this.form1.unitOfMeasureId,
-        materialTheoreticalWeight:this.form1.materialTheoreticalWeight,
+        materialId: this.form1.materialId,
+        materialCode: this.form1.materialCode,
+        materialName: this.form1.materialName,
+        materialSpecification: this.form1.materialSpecification,
+        materialModel: this.form1.materialModel,
+        materialTypeId: this.materialTypeId,
+        unitOfMeasureId: this.form1.unitOfMeasureId,
+        materialTheoreticalWeight: this.form1.materialTheoreticalWeight
       };
-         if(
-        RmsMaterial.materialCode==null ||
-        RmsMaterial.materialName==null ||
-        RmsMaterial.materialSpecification==null ||
-        RmsMaterial.materialModel==null ||
-        RmsMaterial.materialTypeId==null ||
-        RmsMaterial.unitOfMeasureId==null ||
-        RmsMaterial.materialTheoreticalWeight==null 
-      )this.$message.error("存在空值！");
-        this.axios
-          .post(
-            "/api/v1/rms/updateMaterial",
-            RmsMaterial
-          )
-          .then((res) => {
-            if (res.data.code == "200") {
-              this.$router.go(-1);
-            }
-          });
-    },
+      this.axios.post("/api/v1/rms/updateMaterial", RmsMaterial).then(res => {
+        if (res.data.code == "200") {
+          this.$router.go(-1);
+        }
+      });
+    }
   },
-    // 取消
-    cancel() {
-      this.$router.go(-1);
-    },
+  // 取消
+  cancel() {
+    this.$router.go(-1);
+  }
 };
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
 .form-box,
- .button-box{
-    display: flex;
-    justify-content: center;
-    .el-button{
-      width: 80px;
-      margin-right: 10px;
-    }
+.button-box {
+  display: flex;
+  justify-content: center;
+  .el-button {
+    width: 80px;
+    margin-right: 10px;
   }
-</style>
+}
+</style>

src/views/RMS/components/inwardContractMaterial.vue

@@ -3,16 +3,27 @@
     <div class="top">
       <el-input placeholder="请输入物资名称" clearable></el-input>
       <el-button type="primary" @click="onclick">查询</el-button>
+      <el-button type="primary" @click="onInsert">新增</el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="option" ref="table"> </dilTable>
     </div>
-    <div class="table"></div>
   </div>
 </template>
 <script>
 export default {
   data() {
-    return {};
+    return {
+      option: {
+        requestUrl: "/api/v1/rms/getInwardContractMaterial?apiId=482"
+      }
+    };
   },
-  methods: {}
+  methods: {
+    onInsert() {
+      this.$router.push("/addInwardContractMaterial");
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>
@@ -24,5 +35,9 @@ export default {
       width: 250px;
     }
   }
+  .table {
+    margin-left: 30px;
+    margin-top: 30px;
+  }
 }
 </style>

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

@@ -13,52 +13,35 @@
         <i class="el-icon-refresh"></i>刷新
       </el-button>
     </div>
-    <el-tabs v-model="activeName" @tab-click="handleClick">
-      <!-- 已审批 -->
-      <el-tab-pane label="已审批" name="four">
-        <mergeRowTable
-          v-bind.sync="option4"
-          @selection-change="selectionChange"
-          ref="table"
-        >
-          <el-table-column fixed="right" label="操作" width="200">
-            <template slot-scope="scope">
-              <el-button
-                @click="coproductSendClick(scope.row.saleOrderId)"
-                type="text"
-                size="small"
-                >副产品派车</el-button
-              >
-              <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>
-        </mergeRowTable>
-      </el-tab-pane>
-    </el-tabs>
+    <div class="table">
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <!-- 已审批 -->
+        <el-tab-pane label="已审批" name="four">
+          <mergeRowTable
+            v-bind.sync="option4"
+            @selection-change="selectionChange"
+            ref="table"
+          >
+            <el-table-column fixed="right" label="操作" width="120">
+              <template slot-scope="scope">
+                <el-button
+                  @click="coproductSendClick(scope.row.saleOrderId)"
+                  type="text"
+                  size="small"
+                  >副产品派车</el-button
+                >
+                <el-button
+                  @click="checkSaleOrderDetails(scope.row.saleOrderId)"
+                  type="text"
+                  size="small"
+                  >运单</el-button
+                >
+              </template>
+            </el-table-column>
+          </mergeRowTable>
+        </el-tab-pane>
+      </el-tabs>
+    </div>
     <!-- 承运商模态框 -->
     <el-drawer
       title="选择承运商"
@@ -107,22 +90,9 @@ export default {
       index: "",
       carrierId: null,
       carrierName: null,
-      option: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getSaleOrderInfoes?apiId=408"
-      },
-      option2: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getSaleOrderReportedes?apiId=408"
-      },
-      option3: {
-        // 表格请求数据的地址
-        requestUrl: "/api/v1/ams/getAmsSaleOrderApprovedes?apiId=409"
-      },
       option4: {
         // 表格请求数据的地址
-        requestUrl:
-          "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1",
+        requestUrl: "/api/v1/ams/getFuSaleOrderList?apiId=481",
         selectionType: "select",
         comparison: "saleNumber",
         columnIndexs: [0, 1, 2, 3, 4, 8, 9, 10, 11, 12, 13, 14, 15]
@@ -132,74 +102,23 @@ export default {
         selectionType: "radio"
       },
       mapList: [],
-      mapItemList: [],
-      //记录旧的row对象 (销售公司已审批)
-      oldRow: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (销售公司已审批)
-      oldRowCount: 1,
-      //记录旧的row对象 (财务已审批)
-      oldRow1: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (财务已审批)
-      oldRowCount1: 1,
-      //记录旧的row对象 (已上报)
-      oldRow2: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (已上报)
-      oldRowCount2: 1,
-      //记录旧的row对象 (未上报)
-      oldRow3: "",
-      //记录上一个展开的点击次数，单数为展开状态，复数为闭合状态 (未上报)
-      oldRowCount3: 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: [],
-      //(未上报)
-      tableData3: []
+      mapItemList: []
     };
   },
   methods: {
-    refresh() {
-      this.$router.go(0);
+    checkSaleOrderDetails(saleOrderId) {
+      console.log(saleOrderId);
+      this.$router.push("saleOrderOODetails/" + saleOrderId);
     },
-    handleClick(tab, event) {
-      console.log(tab, event);
+    refresh() {
+      this.option4.requestUrl =
+        "/api/v1/ams/getFuSaleOrderList?apiId=481&i=" + new Date();
     },
+    handleClick(tab, event) {},
     onclick() {
-      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&shipperId=1&con=" +
-          this.input;
-      }
+      this.option4.requestUrl =
+        "/api/v1/ams/getSaleOrderListBySaleCompanyes?apiId=409&shipperId=1&con=" +
+        this.input;
     },
     //模糊查询承运商
     onclickCarrier() {
@@ -280,186 +199,6 @@ export default {
     },
     coproductSendClick(saleOrderId) {
       this.$router.push("/addSaleOrderCoproductSend/" + saleOrderId);
-    },
-    // -------查看物资详情 (已审批)
-    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/ams/getSaleMaterialList?saleOrderId=" + row.saleOrderId)
-        .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/ams/getSaleMaterialList?saleOrderId=" + row.saleOrderId)
-        .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/ams/getSaleMaterialList?saleOrderId=" + row.saleOrderId)
-        .then(res => {
-          this.tableData2 = res.data.data;
-        });
-    },
-
-    // -------查看物资详情 (未上报)
-    detailclick3(row) {
-      // 记录重复点击次数
-      if (this.oldRow3 === row) {
-        this.oldRowCount3 += 1;
-      }
-      // 切换当前详情表
-      this.$refs.table3.toggleRowExpansion(row);
-      // 打开前关闭上一个详情表
-      if (this.oldRow3 != "") {
-        if (this.oldRow3 != row) {
-          if (this.oldRowCount3 % 2 === 1) {
-            this.$refs.table3.toggleRowExpansion(this.oldRow3);
-          } else {
-            this.oldRowCount3 = 1;
-          }
-        } else {
-          this.oldRow3 = null;
-          return;
-        }
-      }
-      // 重置上一个点击对象
-      this.oldRow3 = row;
-      // 根据销售订单id查询物资信息
-      this.axios
-        .post("/api/v1/ams/getSaleMaterialList?saleOrderId=" + row.saleOrderId)
-        .then(res => {
-          this.tableData3 = res.data.data;
-        });
-    },
-
-    // 上传
-    uploadclick(saleOrderId) {
-      this.$confirm("是否上传", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "上传成功!"
-          });
-          this.axios
-            .post("/api/v1/ams/uploadSaleOrder?saleOrderId=" + saleOrderId)
-            .then(() => {
-              this.$router.go(0);
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消上传!"
-          });
-        });
-    },
-    //删除
-    deleteclick(scope) {
-      let saleOrderId = scope;
-      this.$confirm("是否删除", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        center: true
-      })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "删除成功!"
-          });
-          this.axios
-            .post(
-              "/api/v1/ams/deleteAmsSaleOrderBySaleOrderId?saleOrderId=" +
-                saleOrderId
-            )
-            .then(() => {
-              this.$router.go(0);
-            });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "取消删除!"
-          });
-        });
     }
   }
 };
@@ -473,5 +212,9 @@ export default {
       margin-right: 1.25rem;
     }
   }
+  .table {
+    margin-left: 20px;
+    margin-top: 20px;
+  }
 }
 </style>

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

@@ -10,61 +10,40 @@
         <i class="el-icon-back"></i>返回
       </el-button>
     </div>
-    <el-dialog
-      title="车辆信息"
-      :visible.sync="dialogTableVisible"
-      :before-close="handleClose"
-    >
-      <el-input style="width:250px" v-model="truckText"></el-input>
-      <el-button type="primary" @click="getCapacity">查询</el-button>
-      <dilTable
-        v-bind.sync="truck"
-        @radio-change="currentRadioChange1"
-      ></dilTable>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogTableVisible = false">取 消</el-button>
-        <el-button type="primary" @click="updateTruckCapacity()"
-          >确 定</el-button
-        >
-      </span>
-    </el-dialog>
-    <div class="transportOrder_bottom">
-      <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="未接收" name="first">
-          <dilTable v-bind.sync="first" ref="table">
-            <el-table-column fixed="right" label="操作" width="150">
-              <template slot-scope="scope">
-                <el-button @click="updateClick(scope)" type="text" size="small">
-                  修改
-                </el-button>
-                <el-button @click="deleteClick(scope)" type="text" size="small">
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </dilTable>
-        </el-tab-pane>
-        <!-- 已接收 -->
-        <el-tab-pane label="已接收" name="Received">
-          <dilTable v-bind.sync="Received" ref="table1"> </dilTable>
-        </el-tab-pane>
-        <!-- 已完成 -->
-        <el-tab-pane label="已完成" name="completed">
-          <dilTable v-bind.sync="completed" ref="table2"> </dilTable>
-        </el-tab-pane>
-        <!-- 已拒绝 -->
-        <el-tab-pane label="已拒绝" name="refused">
-          <dilTable v-bind.sync="refused">
-            <el-table-column fixed="right" label="操作" width="100">
-              <template slot-scope="scope">
-                <el-button @click="ctrlZClick(scope)" type="text" size="small">
-                  撤销
-                </el-button>
-              </template>
-            </el-table-column>
-          </dilTable>
-        </el-tab-pane>
-      </el-tabs>
+    <div>
+      <el-dialog
+        title="车辆信息"
+        :visible.sync="dialogTableVisible"
+        :before-close="handleClose"
+      >
+        <el-input style="width:250px" v-model="truckText"></el-input>
+        <el-button type="primary" @click="getCapacity">查询</el-button>
+        <dilTable
+          v-bind.sync="truck"
+          @radio-change="currentRadioChange1"
+        ></dilTable>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogTableVisible = false">取 消</el-button>
+          <el-button type="primary" @click="updateTruckCapacity()"
+            >确 定</el-button
+          >
+        </span>
+      </el-dialog>
+    </div>
+
+    <div class="table">
+      <dilTable v-bind.sync="first" ref="table">
+        <el-table-column fixed="right" label="操作" width="120">
+          <template slot-scope="scope">
+            <el-button @click="updateClick(scope)" type="text" size="small">
+              修改
+            </el-button>
+            <el-button @click="deleteClick(scope)" type="text" size="small">
+              关闭
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
     </div>
   </div>
 </template>
@@ -95,23 +74,6 @@ export default {
         // 控制显示当选列
         selectionType: "radio"
       },
-      Received: {
-        requestUrl: ""
-      },
-      completed: {
-        requestUrl: ""
-      },
-      refused: {
-        requestUrl: ""
-      },
-      //车辆的表格
-      truck: {
-        requestUrl: "",
-        selectionType: "radio"
-      },
-      tableData: [],
-      tableData1: [],
-      tableData2: [],
       //当前选中的订单id
       selectOrderId: null,
       //选中的车辆号
@@ -123,8 +85,6 @@ export default {
       //模态框从左往右打开
       direction: "rtl",
       orderId: null,
-      //多选的选中的订单id
-      selectionList: [],
       //区别点击的是添加运力，还是修改
       index: null
     };
@@ -132,65 +92,31 @@ export default {
   created() {
     this.truck.requestUrl = "/api/v1/uc/getAllCapacityByCarrierLike?apiId=429";
     this.first.requestUrl =
-      "/api/v1/oms/getDriverInfoForSale?apiId=478&orderStatus=4" +
-      "&saleOrderId=" +
-      this.$route.params.saleOrderId;
-    this.Received.requestUrl =
-      "/api/v1/oms/getDriverInfoForSale?apiId=478&orderStatus=5" +
-      "&saleOrderId=" +
-      this.$route.params.saleOrderId;
-    this.completed.requestUrl =
-      "/api/v1/oms/getDriverInfoForSale?apiId=478&orderStatus=2" +
-      "&saleOrderId=" +
-      this.$route.params.saleOrderId;
-    this.refused.requestUrl =
-      "/api/v1/oms/getDriverInfoForSale?apiId=478&orderStatus=6" +
+      "/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4" +
       "&saleOrderId=" +
       this.$route.params.saleOrderId;
   },
   methods: {
+    onclick() {
+      this.first.requestUrl =
+        "/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4" +
+        "&saleOrderId=" +
+        this.$route.params.saleOrderId +
+        "&con=" +
+        this.input +
+        "&i=" +
+        new Date();
+    },
     back() {
       this.$router.go(-1);
     },
-    //撤销已拒绝的运输订单
-    ctrlZClick(scope) {
-      console.log(scope.row.orderId);
-      this.axios
-        .post("/api/v1/oms/refuseCtrlZ", {
-          orderId: scope.row.orderId
-        })
-        .then(res => {
-          if (res.data.code == "200") {
-            this.$message.success("撤单成功");
-            this.getRequestUrl();
-          }
-        });
-    },
     handleClose(done) {
       done();
       this.$message.info("取消修改运力");
     },
     getRequestUrl() {
       this.first.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale?apiId=478&orderStatus=4" +
-        "&saleOrderId=" +
-        this.$route.params.saleOrderId +
-        "&i=" +
-        new Date();
-      this.Received.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale?apiId=478&orderStatus=5" +
-        "&saleOrderId=" +
-        this.$route.params.saleOrderId +
-        "&i=" +
-        new Date();
-      this.completed.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale?apiId=478&orderStatus=2" +
-        "&saleOrderId=" +
-        this.$route.params.saleOrderId +
-        "&i=" +
-        new Date();
-      this.refused.requestUrl =
-        "/api/v1/oms/getDriverInfoForSale?apiId=478&orderStatus=6" +
+        "/api/v1/oms/getDriverInfoForSale2?apiId=484&orderStatus=4" +
         "&saleOrderId=" +
         this.$route.params.saleOrderId +
         "&i=" +
@@ -303,98 +229,6 @@ export default {
             new Date();
         }
       }
-    },
-    //获取物资详情--未接收
-    getMatrialDetails1(row) {
-      console.log(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;
-      this.axios
-        .post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId)
-        .then(res => {
-          console.log(res.data.data);
-          this.tableData = res.data.data;
-        });
-    },
-    //获取物资详情--已接收
-    getMatrialDetails2(row) {
-      console.log(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;
-      this.axios
-        .post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId)
-        .then(res => {
-          console.log(res.data.data);
-          this.tableData1 = res.data.data;
-        });
-    },
-    //获取物资详情--已完成
-    getMatrialDetails3(row) {
-      console.log(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;
-      this.axios
-        .post("/api/v1/ams/getSporadic?sporadicId=" + row.sporadicOrderId)
-        .then(res => {
-          this.tableData2 = res.data.data;
-        });
     }
   }
 };
@@ -419,5 +253,9 @@ export default {
     display: flex;
     align-items: center;
   }
+  .table {
+    margin-left: 30px;
+    margin-top: 10px;
+  }
 }
 </style>

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

@@ -102,6 +102,9 @@
             <el-button type="text" size="mini" @click="updateMaterial(scope)">
               物资异常
             </el-button>
+            <el-button type="text" size="mini" @click="updateAddress(scope)">
+              收货地址异常
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -135,6 +138,20 @@
               <!-- 插入输入框 -->
               <template slot-scope="scope">
                 <template v-if="item.slot">
+                  <!-- 物资名称 -->
+                  <template v-if="item.prop == 'materialName'">
+                    <el-input
+                      style="width: 200px"
+                      v-model="scope.row.materialName"
+                      disabled
+                    >
+                    </el-input>
+                    <el-button
+                      type="primary"
+                      @click="changeMaterial(scope.$index)"
+                      >更改</el-button
+                    >
+                  </template>
                   <!-- 物资件数 -->
                   <template v-if="item.prop == 'orderPlanWeight'">
                     <el-input
@@ -249,7 +266,8 @@ export default {
         {
           prop: "materialName",
           label: "物资名称",
-          width: "90"
+          width: "90",
+          slot: true
         },
         {
           prop: "meterNumber",
@@ -282,6 +300,7 @@ export default {
     this.getOrderList();
   },
   methods: {
+    updateAddress(scope) {},
     cancelUpdateMaterial() {
       this.dialogTableVisible = false;
       this.getOrderList();
@@ -515,5 +534,8 @@ export default {
     margin-top: 20px;
     margin-left: 20px;
   }
+  .dialog {
+    width: 600px;
+  }
 }
 </style>

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

@@ -321,7 +321,7 @@ export default {
               that.initParkingMarkes(
                 20,
                 35,
-                require("@/assets/img/start.png"),
+                require("@/assets/img/park.png"),
                 calculationPoint.lon,
                 calculationPoint.lat,
                 message.split(".")[0] + "分钟"
@@ -355,7 +355,7 @@ export default {
             that.initLeaveMarkes(
               20,
               35,
-              require("@/assets/img/start.png"),
+              require("@/assets/img/leave.png"),
               item2.lon,
               item2.lat,
               message.split(".")[0] + "分钟"
@@ -488,8 +488,10 @@ export default {
           endTime: that.formatDate(that.time[1], "yyyy-MM-dd hh:mm:ss")
         })
         .then(res => {
-          if (res.data.startAndEndRoutes != "") {
-            that.listPath = res.data.startAndEndRoutes;
+          if(res.data.data=="-1"){
+             this.$message.error('自提车辆无权查看!');
+          }else if (res.data.data.startAndEndRoutes != "") {
+            that.listPath = res.data.data.startAndEndRoutes;
             that.initMap([105.602725, 37.076636]);
           } else {
             this.$message.error("车辆没有开启GPS");

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

@@ -64,14 +64,19 @@ export default {
       that.axios
         .get("/api/v1/otms/getCurrentLocation?capcityNumber="+that.carNumber)
         .then(res => {
-          console.log(res);
-          console.log(res.data.data.result.lon);
-          console.log(res.data.data.result.lat);
-          that.map.setCenter([res.data.data.result.lon,res.data.data.result.lat]);
-          //画车
-          that.initMarkes( 45,60, require("@/assets/img/car1.png"),res.data.data.result.lon,res.data.data.result.lat,"现在所在位置");
-          //显示窗体
-          that.initCustomMarkes(that.carNumber,res.data.data.result.adr,res.data.data.result.lon,res.data.data.result.lat);
+              console.log(res.data.data)
+              if(res.data.data=='-1'){
+                 this.$message.error('自提车辆无权查看!');
+              }else if(res.data.data.status!='1006'){
+                console.log("res.data.data.status")
+                  that.map.setCenter([res.data.data.result.lon,res.data.data.result.lat]);
+                  //画车
+                  that.initMarkes( 45,60, require("@/assets/img/car1.png"),res.data.data.result.lon,res.data.data.result.lat,"现在所在位置");
+                  //显示窗体
+                  that.initCustomMarkes(that.carNumber,res.data.data.result.adr,res.data.data.result.lon,res.data.data.result.lat);
+              }else{
+                  this.$message.error("车辆暂时无GPS");
+              }
           });
           
     },
@@ -84,7 +89,7 @@ export default {
         that.map = new AMap.Map("amap-container", {
           //设置地图容器id
           viewMode: "2D", //是否为2D地图模式
-          zoom: 10, //初始化地图级别
+          zoom: 18, //初始化地图级别
           center: [lon,lat] //初始化地图中心点位置105.602725,37.076636
         });
       });

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

@@ -167,7 +167,7 @@ export default {
           label: '中联厂出口'
         }],
       dateValue:[new Date(), new Date()],
-      inputValue:"螺纹钢",
+      inputValue:"",
       exceptionType:"全部类型",
       selectOrderNumber:"",
       capacityNumber1:"",
@@ -371,7 +371,7 @@ export default {
                       "capacityNumbers": this.capacityNumber1,
                       "carrierNames":this.carrierName,
                       "outGatepostNames":this.gatepostName,
-                      "consigneeCompanyNames": this.consigneeCompanyName1});
+                      "receiveNames": this.consigneeCompanyName1});
       }
       if(this.activeName=="second"){
       //改变已完成条件              
@@ -381,7 +381,7 @@ export default {
                       "capacityNumbers": this.capacityNumber1,
                       "carrierNames":this.carrierName,
                       "outGatepostNames":this.gatepostName,
-                      "consigneeCompanyNames": this.consigneeCompanyName1});
+                      "receiveNames": this.consigneeCompanyName1});
       }
       if(this.activeName=="third"){
       //改变有异常条件              
@@ -392,7 +392,7 @@ export default {
                       "carrierName1":this.carrierName,
                       "abnormalType":this.exceptionType=="全部类型"?"":this.exceptionType,
                       "outGatepostNames":this.gatepostName,
-                      "consigneeCompanyName1": this.consigneeCompanyName1});
+                      "receiveNames": this.consigneeCompanyName1});
       }                              
     },
 
@@ -413,7 +413,6 @@ export default {
         this.pathOption.capacityNumber=row.capacityNumber;
         this.pathOption.startPointName="达钢集团"+row.outGatepostName,
         this.pathOption.endPointName=row.deliveryAddress,
-         console.log(this.pathOption,"this.pathOption")
         this.value7=true;
     },
     allDistanceclick(orderNumber){

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

@@ -294,7 +294,7 @@ export default {
                         that.initParkingMarkes(
                             20,
                             35,
-                            require("@/assets/img/start.png"),
+                            require("@/assets/img/park.png"),
                             calculationPoint.lon,
                             calculationPoint.lat,
                             message.split(".")[0] + "分钟"
@@ -337,7 +337,7 @@ export default {
                         that.initLeaveMarkes(
                         20,
                         35,
-                        require("@/assets/img/start.png"),
+                        require("@/assets/img/leave.png"),
                         item2.lon,
                         item2.lat,
                         message.split(".")[0] + "分钟"
@@ -432,8 +432,11 @@ export default {
         initData(orderNumber){
             let that=this;
              that.axios.post("/api/v1/otms/fullPath?orderNumber="+orderNumber).then((res) => {
-                 if(res.data.startAndEndRoutes!=null){
-                     that.listPath=res.data.startAndEndRoutes
+                 console.log(res.data)
+                 if(res.data.data=='-1'){
+                     this.$message.error('自提车辆无权查看!');
+                 }else if(res.data.data.startAndEndRoutes!=null){
+                     that.listPath=res.data.data.startAndEndRoutes
                     that.initMap();
                  }else{
                      that.listPath=[];

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

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

src/views/sale/components/transport_excute/tms-offsite/arrivalResult.vue

@@ -1,8 +1,9 @@
 <template>
   <!-- 抵达页面 -->
   <div class="purchasFuelNewMonitor">
-    <div class="frameCalculation">
-      <span>抵达时间：</span>
+    <el-form :inline="true">
+      <el-form-item>
+        <span>抵达时间：</span>
       <el-date-picker
         v-model="startTime"
         type="datetime"
@@ -12,11 +13,31 @@
       <span>至</span>
       <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
-      <el-input placeholder="请输入内容" v-model="input" clearable> </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-    </div>
+      </el-form-item>
+      <el-form-item>
+        <span class="el-form-item__span" style="width: auto;">产品分类</span>
+          <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">车牌号</span>
+          <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">收货单位</span>
+          <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">承运单位</span>
+          <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+        <span class="el-form-item__span" style="width: auto;">门岗名称</span>
+        <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+        <el-button type="primary" @click="onclick"><i class="el-icon-search"></i>查询</el-button>
+      </el-form-item>
+    </el-form>
     <div class="table">
       <el-table
         @filter-change="filterChange"
@@ -95,6 +116,13 @@ export default {
   name: "homeworkPath",
   data() {
     return {
+      inputValue:"",
+      consigneeCompanyName1:"",
+      exceptionType:"全部类型",
+      selectOrderNumber:"",
+      capacityNumber1:"",
+      carrierName:"",
+       gatepostName:"",
       spanArr: [],
       dataTabel: [],
       // 自己的数据总条数
@@ -234,7 +262,13 @@ export default {
         if (this.isKuang) {
           // 发送请求
           this.axios
-            .post(url, data, {
+            .post(url, {"startTime":sjTime(this.startTime),
+                      "endTime": sjTime(this.endTime),
+                      "materialNames": this.inputValue,
+                      "capacityNumbers": this.capacityNumber1,
+                      "carrierNames":this.carrierName,
+                      "outGatepostNames":this.gatepostName,
+                      "receiveNames": this.consigneeCompanyName1}, {
               // 请求地址 中
               params: {
                 pageNum: 1,
@@ -253,7 +287,13 @@ export default {
         } else {
           // 发送请求
           this.axios
-            .post(url, data, {
+            .post(url, {"startTime":sjTime(this.startTime),
+                      "endTime": sjTime(this.endTime),
+                      "materialNames": this.inputValue,
+                      "capacityNumbers": this.capacityNumber1,
+                      "carrierNames":this.carrierName,
+                      "outGatepostNames":this.gatepostName,
+                      "receiveNames": this.consigneeCompanyName1}, {
               // 请求地址 中
               params: {
                 pageNum: pageNum || this.dataCurrentPage,
@@ -327,6 +367,14 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.el-input {
+    width: 150px;
+    margin-left: 5px;
+}
+span.el-form-item__span {
+    float: left;
+    margin-top: 7px;
+}
 .purchasFuelNewMonitor {
   .frameCalculation {
     width: 100%;

src/views/sale/components/transport_excute/tms-offsite/receiptResult.vue

@@ -1,8 +1,9 @@
 <template>
   <!-- 收货页面 -->
    <div class="purchasFuelNewMonitor">
-    <div class="frameCalculation">
-      <span>收货时间：</span>
+    <el-form :inline="true">
+      <el-form-item>
+        <span>抵达时间：</span>
       <el-date-picker
         v-model="startTime"
         type="datetime"
@@ -10,25 +11,33 @@
       >
       </el-date-picker>
       <span>至</span>
-      <el-date-picker
-        v-model="endTime"
-        type="datetime"
-        placeholder="选择日期"
-      >
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
       </el-date-picker>
-        <el-input
-        placeholder="请输入内容"
-        v-model="input"
-        clearable>
-      </el-input>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <!-- <el-button type="primary" @click="exportData()"><i class="el-icon-download"></i>导出(Excel)</el-button>
-      <el-button type="primary" @click="refresh">
-        <i class="el-icon-refresh"></i>刷新
-      </el-button> -->
-    </div>
+      </el-form-item>
+      <el-form-item>
+        <span class="el-form-item__span" style="width: auto;">产品分类</span>
+          <el-input v-model="inputValue" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">车牌号</span>
+          <el-input v-model="capacityNumber1" placeholder="请输入内容"></el-input>
+      </el-form-item>
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">收货单位</span>
+          <el-input v-model="consigneeCompanyName1" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+          <span class="el-form-item__span" style="width: auto;">承运单位</span>
+          <el-input v-model="carrierName" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+        <span class="el-form-item__span" style="width: auto;">门岗名称</span>
+        <el-input v-model="gatepostName" placeholder="请输入内容"></el-input>
+      </el-form-item> 
+      <el-form-item>
+        <el-button type="primary" @click="onclick"><i class="el-icon-search"></i>查询</el-button>
+      </el-form-item>
+    </el-form>
     <div class="table">
       <el-table
         @filter-change="filterChange"
@@ -106,6 +115,13 @@ export default {
   name: "homeworkPath",
   data() {
     return {
+      inputValue:"",
+      consigneeCompanyName1:"",
+      exceptionType:"全部类型",
+      selectOrderNumber:"",
+      capacityNumber1:"",
+      carrierName:"",
+       gatepostName:"",
        spanArr: [],
       dataTabel: [],
       // 自己的数据总条数
@@ -245,7 +261,13 @@ export default {
         if (this.isKuang) {
           // 发送请求
           this.axios
-            .post(url, data, {
+            .post(url,  {"startTime":sjTime(this.startTime),
+                      "endTime": sjTime(this.endTime),
+                      "materialNames": this.inputValue,
+                      "capacityNumbers": this.capacityNumber1,
+                      "carrierNames":this.carrierName,
+                      "outGatepostNames":this.gatepostName,
+                      "receiveNames": this.consigneeCompanyName1}, {
               // 请求地址 中
               params: {
                 pageNum: 1,
@@ -264,7 +286,13 @@ export default {
         } else {
           // 发送请求
           this.axios
-            .post(url, data, {
+            .post(url,  {"startTime":sjTime(this.startTime),
+                      "endTime": sjTime(this.endTime),
+                      "materialNames": this.inputValue,
+                      "capacityNumbers": this.capacityNumber1,
+                      "carrierNames":this.carrierName,
+                      "outGatepostNames":this.gatepostName,
+                      "receiveNames": this.consigneeCompanyName1}, {
               // 请求地址 中
               params: {
                 pageNum: pageNum || this.dataCurrentPage,
@@ -333,7 +361,7 @@ export default {
       }
       if(startTime && endTime){
         if(startTime < endTime){
-          this.requestUrl = '/api/v1/tms/getReceiptResult?apiId=471' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.input; 
+          this.requestUrl = '/api/v1/otms/getReceiptResult?apiId=471' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.input; 
            this.requestData(this.option);
        }else{
           this.startTime = null;
@@ -341,15 +369,23 @@ export default {
           this.$message.warning('开始时间要比结束时间早')
         }
       }else{
-        console.log(startTime && endTime)
-         this.requestUrl = '/api/v1/tms/getReceivingResult?apiId=471' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.input; 
-        this.requestData(this.option);
+        // console.log(startTime && endTime)
+        //  this.requestUrl = '/api/v1/otms/getReceiptResult?apiId=471' + "&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date()+"&con="+this.input; 
+        // this.requestData(this.option);
       }
     },
    }
 };
 </script>
 <style lang='scss' scoped>
+.el-input {
+    width: 150px;
+    margin-left: 5px;
+}
+span.el-form-item__span {
+    float: left;
+    margin-top: 7px;
+}
 .purchasFuelNewMonitor {
   .frameCalculation {
     width: 100%;

src/views/sale/router/index.js

@@ -58,7 +58,8 @@ import newNotice from '../components/dilNotice/newNotice.vue'
 import outFactoryResult from '../components/transport_excute/outFactory/outFactoryResult.vue'
 import smsResult from '../components/transport_excute/outFactory/smsResult.vue'
 import arrivalPhoto from '../components/transport_excute/tms-offsite/arrivalPhoto.vue'
-import arrivalResult from '../components/transport_excute/tms-offsite/arrivalResult.vue'
+import arrivalResult from '../components/transport_excute/tms-offsite/arrivalResult.vue' 
+import transportationPerformance from '../components/offSiteTransportation/transportationPerformance.vue' 
 import distance from '../components/transport_excute/tms-offsite/distance.vue'
 // import inTransit from '../components/transport_excute/offSiteTransportation/inTransit.vue'
 import inTransitAbnormal from '../components/transport_excute/tms-offsite/inTransitAbnormal.vue'
@@ -217,7 +218,8 @@ const constantRouterMap = [
 		{path: 'checkGPS', name: 'checkGPS', meta: {code: 'xtpzgl-yhgl'}, component: checkGPS},
 		{path: 'currentLocation', name: 'currentLocation', meta: {code: 'xtpzgl-yhgl'}, component: currentLocation},
 		{path: 'inTransitWarn', name: 'inTransitWarn', meta: {code: 'xtpzgl-yhgl'}, component: inTransitWarn},
-	  ]
+		{path: 'transportationPerformance', name: 'transportationPerformance', meta: {code: 'xtpzgl-yhgl'}, component: transportationPerformance},
+	  ] 
 	}
   ];
   const router = new Router({

src/views/statisticalReport/components/defendCapacity/getCapacityByDefend.vue

@@ -28,17 +28,15 @@
         :disabled="true"
         style="width: 100px"
       ></el-input>
-    </div>
-    <div
-      class="input_box"
-      style="width: 225px; margin-left: 30px; margin-top: 20px"
-    >
-      <el-input placeholder="请输入车牌号/出厂门岗" v-model="input" clearable>
+         <el-input placeholder="请输入车牌号/出厂门岗" v-model="input" style="width: 220px;margin-left: 1rem;" clearable>
       </el-input>
       <el-button type="primary" class="btn" @click="onclick">
         <i class="el-icon-search"></i>查询
       </el-button>
     </div>
+   
+   
+   
     <div class="table">
       <mergeRowTable
         ref="excelDom"

src/views/statisticalReport/components/loadCapacityDetail/loadCapacityDetail.vue

@@ -0,0 +1,170 @@
+<template>
+  <!-- 装机计重明细查询 -->
+  <div class="loadCapacityDetail">
+    <div class="frameCalculation">
+      <span>装车开始时间</span>
+      <el-date-picker v-model="startTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <span>至</span>
+      <el-date-picker v-model="endTime" type="datetime" placeholder="选择日期">
+      </el-date-picker>
+      <el-button type="primary" class="btn" @click="onclickSearch">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button
+      >
+      <span style="margin-left: 1rem;">合计净重：</span>
+      <el-input v-model="totalNumber" :disabled="true" style="width: 100px;"></el-input>
+      <span style="margin-left: 1rem;">合计车数：</span>
+      <el-input v-model="totalCapacity" :disabled="true" style="width: 100px;"></el-input>
+     
+       <el-input placeholder="请输入装机车牌号/可查询当天车辆数据" v-model="input" style="width: 220px;margin-left: 1rem;" clearable>
+      </el-input>
+         <el-button type="primary" class="btn" @click="onclickCapacity">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+   
+    </div>
+    <div class="table">
+      <mergeRowTable ref="excelDom" v-bind.sync="option" @func="func"></mergeRowTable>
+    </div>
+  </div>
+</template>
+
+<script>
+import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
+export default {
+  data() {
+    return {
+      totalNumber: null,
+      totalCapacity: null,
+      startTime: null,
+      endTime: null,
+
+      input: "",
+      tableTitle: "装机计重明细报表",
+      option: {
+        // 表格请求数据的地址
+        requestUrl: "api/v1/tms/getLoaderForResultDetail?apiId=480",
+        comparison: "orderNumber",
+        columnIndexs: [0, 1, 2, 4, 5, 6],
+      },
+    };
+  },
+  created() {
+    if (
+      getCookie("orgCode") == "dagangadmin" ||
+      getCookie("orgCode") == "zidonghuabu"
+    ) {
+      this.option.requestUrl =
+        "/api/v1/tms/getLoaderForResultDetail?apiId=480&startTime=null&endTime=null&i=" +
+        new Date();
+    } else if (getCookie("orgCode") == "wuliuchuyunzhongxin") {
+      this.option.requestUrl =
+        "/api/v1/tms/getLoaderForResultDetail?apiId=480&orderType=13&startTime=null&endTime=null&i=" +
+        new Date();
+    } else {
+      this.option.requestUrl =
+        "/api/v1/tms/getLoaderForResultDetail?apiId=480&userId=" +
+        getCookie("orgCode") +
+        "&startTime=null&endTime=null&i=" +
+        new Date();
+    }
+  },
+  methods: {
+    func(res) {
+      console.log(res);
+      var resultNetWeightTotal = 0;
+      var currentCapacityTotal = 0;
+      res.list.forEach((e) => {
+        currentCapacityTotal++;
+        resultNetWeightTotal = resultNetWeightTotal + e.resultNetWeight;
+      });
+      this.totalNumber = resultNetWeightTotal.toFixed(2) + "t";
+      this.totalCapacity = currentCapacityTotal;
+    },
+    onclickCapacity() {
+      this.option.requestUrl =
+        "/api/v1/tms/getLoaderForResultDetail?apiId=480&con=" + this.input;
+    },
+    getRequestUrl() {
+      if (
+        getCookie("orgCode") == "dagangadmin" ||
+        getCookie("orgCode") == "zidonghuabu"||
+        getCookie("orgCode")=="wuliuchuyunzhongxin"
+      ) {
+        this.option.requestUrl =
+          "/api/v1/tms/getLoaderForResultDetail?apiId=480&startTime=null&endTime=null&i=" +
+          new Date();
+      }  else {
+        this.option.requestUrl =
+          "/api/v1/tms/getLoaderForResultDetail?apiId=480&userId=" +
+          getCookie("orgCode") +
+          "&startTime=null&endTime=null&i=" +
+          new Date();
+      }
+    },
+
+    // 添加开始结束时间筛选
+    onclickSearch() {
+      console.log("aaaa");
+      let startTime = null;
+      let endTime = null;
+      if (this.startTime) {
+        startTime = sjTime(this.startTime);
+        // console.log("startTime", startTime);
+      }
+      if (this.endTime) {
+        endTime = sjTime(this.endTime);
+        // console.log("endTime", endTime);
+      }
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          if (
+            getCookie("orgCode") == "dagangadmin" ||
+            getCookie("orgCode") == "zidonghuabu"
+          ) {
+            this.option.requestUrl =
+              "/api/v1/tms/getLoaderForResultDetail?apiId=480&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          } else if (getCookie("orgCode") == "wuliuchuyunzhongxin") {
+            this.option.requestUrl =
+              "/api/v1/tms/getLoaderForResultDetail?apiId=480&startTime=" +
+              startTime +
+              "&endTime=" +
+              endTime +
+              "&i=" +
+              new Date();
+          }
+        } else {
+          this.startTime = null;
+          this.endTime = null;
+          this.$message.warning("开始时间要比结束时间早");
+        }
+      } else {
+        this.getRequestUrl();
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.purchasFuelNewMonitor {
+  .frameCalculation {
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding-left: 50px;
+    .el-date-editor {
+      margin: 20px;
+    }
+  }
+}
+</style>

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

@@ -1,50 +1,61 @@
 //化产焦炭统计报表
 <template>
   <div class="purchasFuelNewMonitor">
-    <div class="frameCalculation">
-      <span style="width:68px">计毛时间：</span>
-      <el-date-picker
-        v-model="startTime"
-        type="datetime"
-        placeholder="选择日期时间"
-      >
-      </el-date-picker>
-      <span>至</span>
-      <el-date-picker
-        v-model="endTime"
-        type="datetime"
-        placeholder="选择日期时间"
-      >
-      </el-date-picker>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <el-input
+    <el-form :inline="true" style="margin-top :5px">
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">计毛时间：</label>
+            <el-date-picker
+            v-model="startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker
+            v-model="endTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-input
         v-model="inputReceiveName"
         style="width:200px"
         placeholder="输入收货单位"
         clearable="true"
       ></el-input>
       <el-button type="primary" @click="getReceiveName">查询</el-button>
-      <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button
-      >
-      <el-button type="primary" @click="refresh">
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
-      <span style="margin-left: 1rem;width:68px">合计净重：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计净重：</span>
       <el-input
         v-model="totalNumber"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-      <span style="margin-left: 1rem;width:68px">合计车数：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计车数：</span>
       <el-input
         v-model="totalCapacity"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-    </div>
+      </el-form-item>
+    </el-form> 
     <div class="table">
       <dilTable
         ref="excelDom"
@@ -241,16 +252,4 @@ export default {
 </script>
 
 <style lang="scss">
-.purchasFuelNewMonitor {
-  .frameCalculation {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
-    .el-date-editor {
-      margin: 20px;
-    }
-  }
-}
 </style>

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

@@ -1,49 +1,61 @@
 //副产品统计报表
 <template>
   <div class="purchasFuelNewMonitor">
-    <div class="frameCalculation">
-      <span style="width:68px">计毛时间：</span>
-      <el-date-picker
-        v-model="startTime"
-        type="datetime"
-        placeholder="选择日期时间"
-      >
-      </el-date-picker>
-      <span>至</span>
-      <el-date-picker
-        v-model="endTime"
-        type="datetime"
-        placeholder="选择日期时间"
-      >
-      </el-date-picker>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <el-input
+    <el-form :inline="true" style="margin-top :5px">
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">计毛时间：</label>
+            <el-date-picker
+            v-model="startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker
+            v-model="endTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-input
         v-model="inputReceiveName"
         style="width:200px"
         placeholder="输入收货单位"
+        clearable="true"
       ></el-input>
       <el-button type="primary" @click="getReceiveName">查询</el-button>
-      <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button
-      >
-      <el-button type="primary" @click="refresh">
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
-      <span style="margin-left: 1rem;width:68px">合计净重：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计净重：</span>
       <el-input
         v-model="totalNumber"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-      <span style="margin-left: 1rem;width:68px">合计车数：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计车数：</span>
       <el-input
         v-model="totalCapacity"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-    </div>
+      </el-form-item>
+    </el-form>       
     <div class="table">
       <dilTable
         ref="excelDom"
@@ -239,16 +251,4 @@ export default {
 </script>
 
 <style lang="scss">
-.purchasFuelNewMonitor {
-  .frameCalculation {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
-    .el-date-editor {
-      margin: 20px;
-    }
-  }
-}
 </style>

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

@@ -1,43 +1,52 @@
 //钢材统计报表
 <template>
   <div class="purchasFuelNewMonitor">
-    <div class="frameCalculation">
-      <span style="width:68px">计毛时间：</span>
-      <el-date-picker
-        v-model="startTime"
-        type="datetime"
-        placeholder="选择日期时间"
-      >
-      </el-date-picker>
-      <span>至</span>
-      <el-date-picker
-        v-model="endTime"
-        type="datetime"
-        placeholder="选择日期时间"
-      >
-      </el-date-picker>
-      <el-button type="primary" class="btn" @click="onclick">
-        <i class="el-icon-search"></i>查询
-      </el-button>
-      <el-button type="primary" @click="exportData()"
-        ><i class="el-icon-download"></i>导出(Excel)</el-button
-      >
-      <el-button type="primary" @click="refresh">
+    <el-form :inline="true" style="margin-top :5px">
+      <el-form-item>
+        <label class="el-form-item__label" style="width: auto;">计毛时间：</label>
+            <el-date-picker
+            v-model="startTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker
+            v-model="endTime"
+            type="datetime"
+            placeholder="选择日期时间"
+          >
+          </el-date-picker>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>查询
+          </el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
-      <span style="margin-left: 1rem;width:68px">合计净重：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计净重：</span>
       <el-input
         v-model="totalNumber"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-      <span style="margin-left: 1rem;width:68px">合计车数：</span>
+      </el-form-item>
+      <el-form-item>
+        <span style="margin-left: 1rem;width:68px">合计车数：</span>
       <el-input
         v-model="totalCapacity"
         :disabled="true"
         style="width: 150px;"
       ></el-input>
-    </div>
+      </el-form-item>
+    </el-form> 
     <div class="table">
       <!-- <dilTable ref="excelDom" v-bind.sync="option" :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang" @func="func" @requestQuery="requestQuery" :pageSize = "pageSize"></dilTable> -->
       <mergeRowTable ref="excelDom" v-bind.sync="option"> </mergeRowTable>
@@ -192,16 +201,4 @@ export default {
 </script>
 
 <style lang="scss">
-.purchasFuelNewMonitor {
-  .frameCalculation {
-    width: 100%;
-    height: 100px;
-    display: flex;
-    align-items: center;
-    padding-left: 50px;
-    .el-date-editor {
-      margin: 20px;
-    }
-  }
-}
 </style>

src/views/statisticalReport/router/index.js

@@ -27,6 +27,7 @@ import inwardSporadicReport from '../components/sporadicReport/inwardSporadicRep
 import getInstall from '../components/inwardReport/getInstall.vue'
 import getCapacityByDefend from '../components/defendCapacity/getCapacityByDefend.vue'
 import inwardAssemble from '../components/inwardAssemble/inwardAssemble.vue'
+import loadCapacityDetail from '../components/loadCapacityDetail/loadCapacityDetail.vue'
 Vue.use(Router)
 
 const constantRouterMap = [
@@ -57,7 +58,8 @@ const constantRouterMap = [
       {path: 'inwardSporadicReport', name: 'inwardSporadicReport', meta: {code: 'xtpzgl-yhgl'}, component: inwardSporadicReport},
       {path: 'getInstall', name: 'getInstall', meta: {code: 'xtpzgl-yhgl'}, component: getInstall},
       {path: 'getCapacityByDefend', name: 'getCapacityByDefend', meta: {code: 'xtpzgl-yhgl'}, component: getCapacityByDefend},
-      {path: 'inwardAssemble', name: 'inwardAssemble', meta: {code: 'xtpzgl-yhgl'}, component: inwardAssemble}
+      {path: 'inwardAssemble', name: 'inwardAssemble', meta: {code: 'xtpzgl-yhgl'}, component: inwardAssemble},
+      {path: 'loadCapacityDetail', name: 'loadCapacityDetail', meta: {code: 'xtpzgl-yhgl'}, component: loadCapacityDetail}
     ]
   }
 ];