tyiiaj

build/utils.js

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

config/index.js

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

src/views/RMS/components/addCapacity.vue

@@ -95,7 +95,6 @@ export default {
   created() {
     this.carrierUserId = getCookie("userId");
     this.form1 = this.form1Initialization;
-    // console.log(this.carrierUserId, "carrierUserId");
   },
   mounted() {
     this.axios
@@ -124,8 +123,8 @@ export default {
       } else {
         let size = file.size / 1024;
         let _URL = window.URL || window.webkitURL;
-        let img = new Image();
-        img.src = _URL.createObjectURL(file);
+        let img  = new Image();
+        img.src  = _URL.createObjectURL(file);
       }
       return isLt2M;
     },

src/views/RMS/components/addCargoDep.vue

@@ -0,0 +1,91 @@
+<template>
+  <!-- 添加原料仓库信息 -->
+  <div class="addWagonLoad">
+    <PageTitle>返回</PageTitle>
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="383" 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";
+import { getCookie } from "@/utils/util.js";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+      form1: {},
+    };
+  },
+  mounted() {},
+  methods: {
+    makeSure() {
+      let RmsCargoDep = {
+        cargoType: this.form1.cargoType,
+        cargoName: this.form1.cargoName,
+        userId: getCookie("userId"),
+      };
+      if (RmsCargoDep.cargoType == null || RmsCargoDep.cargoName == null)
+        this.$message.error("存在空值！");
+      else
+        this.axios
+          .post("/api/v1/rms/insertCargoDep", RmsCargoDep)
+          .then((res) => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功!",
+              });
+              this.$router.go(-1);
+            } else {
+              this.$message({
+                type: "warning",
+                message: res.data.data,
+              });
+            }
+          });
+    },
+    // 取消
+    cancel() {
+      this.$router.go(-1);
+    },
+  },
+};
+</script>
+<style lang='scss' >
+.addWagonLoad {
+  .button-box {
+    display: flex;
+    justify-content: center;
+    margin-top: 30px;
+    .el-button {
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
+  .form-box {
+    display: flex;
+    justify-content: center;
+    margin-top: 90px;
+    .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/addRawWarehouse.vue

@@ -2,9 +2,9 @@
   <!-- 添加原料仓库信息 -->
   <div class="addWagonLoad">
     <PageTitle>返回</PageTitle>
-     <div class="form-box" style="margin-right: 10rem">
-        <dil-form :formId="315" v-model="form1" ref="from1"></dil-form>
-      </div>
+    <div class="form-box" style="margin-right: 10rem">
+      <dil-form :formId="315" 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>
@@ -14,46 +14,43 @@
 
 <script>
 import PageTitle from "@/components/Page/Title";
-
+import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
   data() {
     return {
       form1: {},
       // value: undefined,
-     
     };
   },
   mounted() {},
   methods: {
-     makeSure() {
-       console.log(this.from1)
-       let RmsWarehouse = {
-         warehouseName:this.form1.warehouseName,
-         shipperId:this.form1.shipperId,
-       };
-       if(
-         RmsWarehouse.warehouseName==null ||
-         RmsWarehouse.shipperId==null
-       )this.$message.error("存在空值！");
-    //  console.log(this.RmsWarehouse)
-      this.axios
-        .post(
-          "/api/v1/rms/insertWarehouse", RmsWarehouse
-        )
-        .then((res) => {
-          if (res.data.code == 200) {
-            this.$message({
-              type: "success",
-              message: "新增成功!",
-            });
-            // this.$refs.table.refreshData();
-            this.$router.go(-1);
-          } else {
-            this.$message.error("新增失败,可能存在重复！");
-          }
-        //  this.$refs['table'].resetField();
-        });
+    makeSure() {
+      // console.log(this.from1);
+      let RmsWarehouse = {
+        warehouseName: this.form1.warehouseName,
+        shipperId: this.form1.shipperId,
+        userId: getCookie("userId"),
+      };
+      if (RmsWarehouse.warehouseName == null || RmsWarehouse.shipperId == null)
+        this.$message.error("存在空值！");
+      else
+        this.axios
+          .post("/api/v1/rms/insertWarehouse", RmsWarehouse)
+          .then((res) => {
+            if (res.data.code == 200) {
+              this.$message({
+                type: "success",
+                message: "新增成功!",
+              });
+              this.$router.go(-1);
+            } else {
+              this.$message({
+                type: "warning",
+                message: res.data.data,
+              });
+            }
+          });
     },
     // 取消
     cancel() {
@@ -62,28 +59,28 @@ export default {
   },
 };
 </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;
         }
       }

src/views/RMS/components/cargoDep.vue

@@ -0,0 +1,107 @@
+//资源管理货权转移送达单位
+<template>
+  <div class="cargoDep">
+    <div class="sache">
+      <el-input placeholder="请输入内容" v-model="textInput" clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button type="primary" class="btn" @click="toInsert">
+        <i class="el-icon-plus"></i>新增
+      </el-button>
+    </div>
+    <div class="table">
+      <dilTable v-bind.sync="options">
+        <el-table-column fixed="right" label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="updateCargoDep(scope)">
+              修改
+            </el-button>
+            <el-button type="text" size="mini" @click="deleteCargoDep(scope)">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </dilTable>
+    </div>
+  </div>
+</template>
+<script>
+import { getCookie } from "@/utils/util.js";
+export default {
+  name:"homeworkPath",
+  data(){
+    return{
+      textInput: "" ,
+      restaurants: [],
+      options:{
+        // first请求数据的地址
+        requestUrl: "/api/v1/rms/getCargoDep?apiId=487",
+      },
+    }
+  },
+  methods:{
+    onclick(){
+        this.options.requestUrl = "/api/v1/rms/getCargoDep?apiId=487&con=" +this.textInput;
+      },
+     toInsert() {
+      this.$router.push("/addCargoDep");
+
+    },
+    updateCargoDep (scope){
+      this.$router.push("/updateCargoDep/" +scope.row.cargoCarrierId)
+    },
+ 
+    deleteCarDriver(scope){
+         let map={
+         cargoCarrierId : scope.row.cargoCarrierId,
+         userId:getCookie("userId"),
+      };
+      this.$confirm("是否删除", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+        center: true,
+      })  
+        .then(() => {
+          this.axios
+            .post("/api/v1/rms/deleteCarDriver/"  + map)
+            .then((res) => {
+              if (res.data.code == 200) {
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });     
+                this.$router.go(0);
+              } else {
+                this.$message({
+                  message: "删除失败",
+                  type: "warning",
+                });
+              }
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "删除操作已取消!",
+          });
+        });
+    },
+    },
+  
+}
+
+</script>
+<style lang="scss" scode>
+.cargoDep {
+  .sache {
+    padding: 1.25rem 0.375rem;
+    .el-input {
+      width: 20%;
+      margin-right: 1.25rem;
+    }
+  }
+}
+</style>

src/views/RMS/components/editRmsShipper.vue

@@ -46,12 +46,10 @@ export default {
             this.$route.params.shipperId
         )
         .then((res) => {
-            console.log(res)
+        
           res.data.data.forEach((e) => {
             this.form1 = e;
-            console.log(e);
-            console.log(this.form1);
-            console.log(this.$route.params.resultId);
+      
           });
         });
     },

src/views/RMS/components/updateCargoDep.vue

@@ -0,0 +1,105 @@
+<template>
+  <!-- 修改原料仓库信息 -->
+  <div id="contractDetails">
+    <page-title>返回</page-title>
+    <div class="main">
+    </div>
+    <div class="contractTitle">
+      <div class="form-box">
+          <dil-form :formId="383" v-model="form1"></dil-form>   
+      </div>
+    </div>
+        
+    <div class="button-box">
+      <el-button @click="onClickCancel">返回</el-button>
+      <el-button type="primary" @click="onClickConfirm">确认</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import PageTitle from "@/components/Page/Title";
+import { getCookie } from "@/utils/util.js";
+import { get } from "http";
+export default {
+  components: { PageTitle },
+  data() {
+    return {
+    form1: {},
+    warehouseName : '',
+    shipperName: '',
+    options: [{
+          value: '',
+          label: ''
+        }],
+    };
+  },
+  mounted() {
+    this.information();
+  },
+  methods: {
+    information() {
+      //编辑
+    //   console.log("warehouseId",this.$route.params.warehouseId);
+      this.axios
+        .post(
+          "/api/v1/rms/getCargoDepById/" +
+            this.$route.params.cargoCarrierId
+        )
+        .then((res) => {
+            res.data.data.forEach((e) => {
+            this.form1 = e;
+          });
+            
+        });
+    },
+    //单选下拉框
+
+    // 返回
+    onClickCancel() {
+      this.$router.go(-1);
+    },
+    // 确认
+    onClickConfirm() {
+       let RmsCargoDep={
+      cargoCarrierId:  this.$route.params.cargoCarrierId,
+      cargoName:this.form1.cargoName,
+      cargoType:this.form1.cargoType,
+      userId:getCookie("userId"),
+    };
+    console.log("rms",RmsCargoDep);
+        this.axios
+          .post(
+            "/api/v1/rms/updateCargoDep",
+          RmsCargoDep 
+          )
+          .then((res) => {
+            if (res.data.code == "200") {
+              this.$router.go(-1);
+            }
+          });
+    },
+  },
+};
+</script>
+<style lang='scss' scoped>
+.form-box,
+ .button-box{
+    display: flex;
+    justify-content: center;
+    margin-top: 2rem;
+    .el-button{
+      width: 80px;
+      margin-right: 10px;
+    }
+  }
+  .shipperName{
+    display: flex;
+    justify-content: center;
+  }
+  .point{
+    display: flex;
+    justify-content: center;
+    margin-top: 1rem;
+  }
+</style>

src/views/RMS/router/index.js

@@ -61,6 +61,9 @@ import consignee from '../components/consignee.vue'
 import inwardContractMaterial from '../components/inwardContractMaterial'
 import addInwardContractMaterial from '../components/addInwardContractMaterial.vue'
 import editInwardMaterial from '../components/editInwardMaterial.vue'
+import cargoDep from '../components/cargoDep.vue'
+import addCargoDep from '../components/addCargoDep.vue'
+import updateCargoDep from '../components/updateCargoDep.vue'
 
 Vue.use(Router)
 const constantRouterMap = [
@@ -126,6 +129,9 @@ const constantRouterMap = [
 		{path: 'inwardContractMaterial', name: 'inwardContractMaterial', meta: {code: 'xtpzgl-yhgl'}, component: inwardContractMaterial},
 		{path: 'addInwardContractMaterial', name: 'addInwardContractMaterial', meta: {code: 'xtpzgl-yhgl'}, component: addInwardContractMaterial},
 		{path: 'editInwardMaterial/:materialTypeId', name: 'editInwardMaterial', meta: {code: 'xtpzgl-yhgl'}, component: editInwardMaterial},	
+		{path: 'cargoDep', name: 'cargoDep', meta: {code: 'xtpzgl-yhgl'}, component: cargoDep},	
+		{path: 'addCargoDep', name: 'addCargoDep', meta: {code: 'xtpzgl-yhgl'}, component: addCargoDep},	
+		{path: 'updateCargoDep/:cargoCarrierId', name: 'updateCargoDep', meta: {code: 'xtpzgl-yhgl'}, component: updateCargoDep},	
 	  ]
 	}
   ];

src/views/appoint/app.js

@@ -19,6 +19,11 @@ import apollo from '@/config/apolloConfig.js'
 Vue.config.productionTip = false;
 
 Vue.use(VueApollo)
+import 'xe-utils' 
+import VXETable from 'vxe-table'
+import 'vxe-table/lib/style.css'
+Vue.use(VXETable)
+Vue.prototype.$XModal = VXETable.modal
 
 // 注册表格的全局组件
 import DilCommonUI from "@/components/DilCommonUI";

src/views/appoint/components/ship/addDeliveryNotice.vue

@@ -2,51 +2,83 @@
   <!-- 添加发货通知 -->
   <div class="shipTransport">
     <page-title>返回</page-title>
+    <div class="mofrom">
+      <span class="motext">物资</span>
+      <el-input class="moinput" v-model="materialName" disabled> </el-input>
+      <el-button class="mobutton" type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+    <!-- 货权转移送达单位 -->
+    <div class="mofrom">
+      <span class="motext">货权转移送达单位</span>
+      <el-input class="moinput" v-model="cargo" disabled> </el-input>
+      <el-button class="mobutton" type="primary" @click="ondrawer(2)">浏览</el-button>
+    </div>
+
+    <!--大品类 -->
+    <div class="mofrom">
+      <span class="motext">大品类</span>
+      <el-input class="moinput" v-model="materialType" disabled> </el-input>
+      <el-button class="mobutton" type="primary" @click="ondrawer(4)">浏览</el-button>
+    </div>
+
+    <!-- 货权转移送达单位 -->
+    <div class="mofrom">
+      <span class="motext">收货人</span>
+      <el-input class="moinput" v-model="receiver" disabled> </el-input>
+      <el-button class="mobutton" type="primary" @click="ondrawer(3)">浏览</el-button>
+    </div>
     <div class="form">
       <div class="form_box">
-        <dil-form
-          :formId="112"
-          v-model="form1"
-          ref="from1"
-          @change="onchange"
-        ></dil-form>
+        <dil-form :formId="112" v-model="form1" ref="from1" @change="onchange"></dil-form>
       </div>
-      <div class="liulan">
-        <el-button type="primary" class="btn" @click="onDrawer">浏览</el-button>
-      </div>
-    </div>
-    <!-- 确定和取消 -->
-    <div class="button_box">
-      <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="makeSure">确定</el-button>
+      <!-- <div class="liulan">
+        <el-button type="primary" class="btn" @click="ondrawer(4)">浏览</el-button>
+      </div> -->
     </div>
+
     <!-- 模态框 -->
-    <el-drawer
-      :visible.sync="drawer"
-      :direction="direction"
-      :before-close="handleClose"
-      size="50%"
-    >
-      <el-input
-        placeholder="请输入内容"
-        v-model="input"
-        style="margin-top: 10px; margin-left: 20px; width: 250px"
-        clearable
-      >
+    <el-drawer :visible.sync="drawer" :direction="direction" :before-close="handleClose" size="50%">
+      <el-input placeholder="请输入内容" v-model="input" style="margin-top: 10px; margin-left: 20px; width: 250px" clearable>
       </el-input>
-      <el-button
-        type="primary"
-        class="btn"
-        @click="onclick()"
-        style="margin-bottom: 15px"
-      >
+      <el-button type="primary" class="btn" @click="onclick(a)" style="margin-bottom: 15px">
         <i class="el-icon-search"></i>查询
       </el-button>
-      <dilTable
-        v-bind.sync="options"
-        @radio-change="currentRadioChange1"
-      ></dilTable>
+      <!-- <div v-show="a == 4">
+        <dilTable v-bind.sync="options" @radio-change="currentRadioChange6"></dilTable>
+      </div> -->
+      <div v-show="a == 1">
+        <dilTable v-bind.sync="second" @radio-change="currentRadioChange1"></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable v-bind.sync="second1" @radio-change="currentRadioChange2"></dilTable>
+      </div>
+      <div v-show="a == 3">
+        <dilTable v-bind.sync="second2" @radio-change="currentRadioChange3"></dilTable>
+      </div>
+      <div v-show="a == 4">
+        <dilTable v-bind.sync="second3" @radio-change="currentRadioChange4"></dilTable>
+      </div>
     </el-drawer>
+    <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:450px;display:flex;">
+      <el-form-item label="上传货权转移附件">
+        <el-upload class="upload-demo" style="width:270px;" ref="upload1" action="/api/v1/rms/uploadCarrier1"
+          :before-upload="beforeUpload" :multiple="false" list-type="picture" :show-file-list="false"
+          :on-success="handleAvatarSuccess" :on-error="onError(1)">
+          <span class="span"></span>
+          <el-input class="shippingCertificate" style="width:270px;display:flex;" placeholder="请选择货权附件(必填项)"
+            v-model="shippingCertificate" disabled>
+          </el-input>
+          <el-button size="small" type="primary"
+            style="width:115px;height:35px;margin-left: 275px;margin-top:-35px;display:flex;" @click="upCLick(1)">
+            点击上传附件</el-button>
+        </el-upload>
+      </el-form-item>
+    </el-form>
+    <!-- 确定和取消 -->
+    <div class="button_box">
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="makeSure">确定</el-button>
+    </div>
   </div>
 </template>
 
@@ -58,23 +90,47 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      a: 1,
+      cargoPictureUrl: "",
+      shippingCertificate: "",
+      materialName: "",
+      materialType: "",
+      cargo: "",
+      receiver: "",
       input: "",
       drawer: false,
       direction: "rtl",
       batchId: null,
       form1: {},
-      options: {
-        requestUrl: "/api/v1/tms/getBatchListForAttorney?apiId=375",
+      second: {
+        requestUrl: "/api/v1/uc/queryMaterialByLike?apiId=244",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      second1: {
+        requestUrl: "/api/v1/tms/selectShippeByName?apiId=215",
         selectionType: "radio",
-        maplist: []
+        mapList2: [],
       },
+      second2: {
+        requestUrl: "/api/v1/tms/getGroupList?apiId=217",
+        selectionType: "radio",
+        mapList3: [],
+      },
+      second3: {
+        requestUrl: "/api/v1/rms/getMaterialTypeList?apiId=376",
+        selectionType: "radio",
+        mapList4: [],
+      },
+
       value: undefined,
       value2: undefined,
       value4: undefined,
       value5: undefined,
       value6: undefined,
       value7: undefined,
-      value8: undefined
+      value8: undefined,
+
     };
   },
   mounted() {
@@ -82,34 +138,129 @@ export default {
     this.$set(this.form1, "carrierId", 11);
   },
   methods: {
-    onDrawer() {
-      this.drawer = true;
+    upCLick(val) {
+      this.num = val;
+    },
+    beforeUpload(file) {
+      this.upBool = true;
+      const isLt2M = file.size < 1024 * 1024 * 0.5;
+      if (!isLt2M) {
+        this.$message.error("上传文件大小不能超过500kb!");
+      } else {
+        let size = file.size / 1024;
+        let _URL = window.URL || window.webkitURL;
+        let img = new Image();
+        img.src = _URL.createObjectURL(file);
+      }
+      return isLt2M;
     },
-    onchange(val) {},
-    onclick() {
-      this.options.requestUrl =
-        "/api/v1/tms/getBatchList?apiId=375&con=" + this.input;
+    onError(err) {
+      if (this.upBool) {
+        if (this.num == 1) {
+          this.shippingCertificate = null;
+          this.cargoPictureUrl = null;
+          // this.$message.error("上传失败");
+        }
+      }
+    },
+    handleAvatarSuccess(res, file) {
+      // console.log("res",res.data)
+      if (res.code) {
+        this.upBool = false;
+        if (this.num == 1) {
+          this.cargoPictureUrl = res.data;
+          this.shippingCertificate = file.name;
+        }
+        this.$message.success("上传成功");
+      }
+    },
+
+    currentRadioChange() {
+      console.log(1);
+    },
+
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      // 清空当前输入框中的数据
+      this.input = "";
     },
     currentRadioChange1(selection) {
-      this.maplist = selection;
-      if (JSON.stringify(this.maplist).length > 2) {
-        this.$set(
-          this.form1,
-          "batchId",
-          selection.resultForeignShipName + selection.materialName
-        );
-        this.batchId = selection.batchId;
+      (this.second.mapList1 = selection),
+        (this.materialName = selection.materialName);
+    },
+    currentRadioChange2(selection) {
+      (this.second1.mapList2 = selection), (this.cargo = selection.cargoName);
+    },
+    currentRadioChange3(selection) {
+      (this.second2.mapList3 = selection), (this.receiver = selection.pierName);
+    },
+    currentRadioChange4(selection) {
+      (this.second3.mapList4 = selection), (this.materialType = selection.materialTypeName);
+    },
+    onchange(val) { },
+    onclick(a) {
+      if (a == 1) {
+        this.second.requestUrl =
+          "/api/v1/uc/queryMaterialByLike?apiId=244&index=" + this.input;
+      } else if (a == 2) {
+        this.second1.requestUrl =
+          "/api/v1/tms/selectShippeByName?apiId=215&con=" + this.input;
+      } else if (a == 3) {
+        this.second2.requestUrl =
+          "/api/v1/tms/getGroupList?apiId=217&con=" + this.input;
+      } else if (a == 4) {
+        // console.log("aaaa");
+        this.second3.requestUrl =
+          "/api/v1/rms/getMaterialTypeList?apiId=376&con=" + this.input;
       }
     },
+    // currentRadioChange6(selection) {
+    //   this.maplist = selection;
+    //   if (JSON.stringify(this.maplist).length > 2) {
+    //     this.$set(
+    //       this.form1,
+    //       "batchId",
+    //       selection.resultForeignShipName + selection.materialName
+    //     );
+    //     this.batchId = selection.batchId;
+    //   }
+    // },
     handleClose(done) {
       done();
     },
     makeSure() {
-      // 判断批次号选择是否为空
-      if (this.batchId == "" || this.batchId == undefined) {
-        this.$message.warning("请选择批次号");
-        return;
+      if (this.second.mapList1.length == 0) {
+        this.$message.warning("请选择物资")
+        return
+      }
+      if (this.second1.mapList2.length == 0) {
+        this.$message.warning("请选择送达单位")
+        return
+      }
+      if (this.second2.mapList3.length == 0) {
+        this.$message.warning("请选择收货人")
+        return
+      }
+      if (this.second3.mapList4.length == 0) {
+        this.$message.warning("请选择物资品类")
+        return
+      }
+
+      //判断是否为电话号码
+      function isTelePhone() {
+        var value2 = map.resultTelephoneFax;
+        //验证是否为数字
+        var patrn = /^1[3-9]\d{9}$/;
+        // var patrn2 = /^(\d{3,4}-)?\d{7,8}$/;
+        if (patrn.exec(value2) == null || value2 == "") {
+          return false;
+        } else {
+          return true;
+        }
       }
+      //电话号码赋值
+      var val2 = this.value2;
       let map = {
         carrierId: this.form1.carrierId,
         requesterGroupId: this.form1.requesterGroupId,
@@ -119,7 +270,7 @@ export default {
         noticePortConstructionFee: this.form1.noticePortConstructionFee,
         noticeDeliveryTime: sjTime(this.form1.noticeDeliveryTime),
         noticePileFreeDays: this.form1.noticePileFreeDays,
-        batchId: this.batchId,
+        // batchId: this.batchId,
         purchaseContractUnitPrice: this.form1.purchaseContractUnitPrice,
         purchaseContractMoisture: this.form1.purchaseContractMoisture,
         //微元素含量
@@ -128,9 +279,23 @@ export default {
         aluminaContent: this.form1.aluminaContent,
         phosphorusContent: this.form1.phosphorusContent,
         manganeseContent: this.form1.manganeseContent,
+        resultContactPerson: this.form1.resultContactPerson,
+        resultTelephoneFax: this.form1.resultTelephoneFax,
+        resultFreightForwardingInfo: this.form1.resultFreightForwardingInfo,
+        resultMemo: this.form1.resultMemo,
+        resultNumberOfLoans: this.form1.resultNumberOfLoans,
+        cargoId: this.second1.mapList2.cargoId,
+        groupId: this.second2.mapList3.id,
+        inFactoryShipName: this.form1.inFactoryShipName,
+        foreignShipName: this.form1.foreignShipName,
+        materialId: this.second.mapList1.materialId,
+        materialTypeId: this.second3.mapList4.materialTypeId,
+        isNeedPortDisCharge: this.form1.isNeedPortDisCharge,
+        isNeedPortFee: this.form1.isNeedPortFee,
+        cargoPictureUrl: this.cargoPictureUrl,
         userId: getCookie("userId")
       };
-      console.log(map.noticePileFreeDays);
+      console.log("mapaaa" +map);
       //判断放货数量是否为数字
       if (
         map.noticeCommerceMethod == null ||
@@ -144,11 +309,25 @@ export default {
         map.silicaContent == null ||
         map.aluminaContent == null ||
         map.phosphorusContent == null ||
-        map.manganeseContent == null
+        map.manganeseContent == null ||
+        map.resultContactPerson == null ||
+        map.resultTelephoneFax == null ||
+        map.resultNumberOfLoans == null ||
+        map.carrierId == null ||
+        map.groupId == null ||
+        map.inFactoryShipName == null ||
+        map.isNeedPortDisCharge == null ||
+        map.isNeedPortFee == null
+        // map.foreignShipName==null||
+        // map.materialId==null
       ) {
         this.$message.error("存在空值！");
         return;
       }
+      if (!isTelePhone(val2)) {
+        this.$message.warning("电话号码或传真格式不正确");
+        return;
+      }
       if (
         typeof map.noticePileFreeDays != "undefined" &&
         !isNumber(map.noticePileFreeDays)
@@ -156,59 +335,59 @@ export default {
         this.$message.error("免堆天数得为数字");
         return;
       }
-      {
-        var value2 = map.purchaseContractUnitPrice;
-        var value4 = map.tfeContent;
-        var value5 = map.silicaContent;
-        var value6 = map.aluminaContent;
-        var value7 = map.phosphorusContent;
-        var value8 = map.manganeseContent;
-        //验证是否为数字
-      }
+
+
       if (
-        typeof  map.purchaseContractUnitPrice != "undefined" &&
+        typeof map.purchaseContractUnitPrice != "undefined" &&
         !isNumber(map.purchaseContractUnitPrice)
       ) {
         this.$message.error("单价得为数字");
         return;
       } if (
-        typeof  map.tfeContent != "undefined" &&
+        typeof map.tfeContent != "undefined" &&
         !isNumber(map.tfeContent)
       ) {
         this.$message.error("tfe含量得为数字");
         return;
-      } 
+      }
       if (
-        typeof  map.silicaContent != "undefined" &&
+        typeof map.silicaContent != "undefined" &&
         !isNumber(map.silicaContent)
       ) {
         this.$message.error("二氧化硅含量得为数字");
         return;
-      } 
+      }
       if (
-        typeof  map.aluminaContent != "undefined" &&
+        typeof map.aluminaContent != "undefined" &&
         !isNumber(map.aluminaContent)
       ) {
         this.$message.error("氧化铝含量得为数字");
         return;
-      } 
-       if (
-        typeof  map.phosphorusContent != "undefined" &&
+      }
+      if (
+        typeof map.phosphorusContent != "undefined" &&
         !isNumber(map.phosphorusContent)
       ) {
         this.$message.error("含磷量得为数字");
         return;
-      }      
+      }
+      if (
+        typeof map.resultNumberOfLoans != "undefined" &&
+        !isNumber(map.resultNumberOfLoans)
+      ) {
+        this.$message.error("放货数量得为数字");
+        return;
+      }
       else
         this.axios.post("/api/v1/tms/insertDeliveryNotice", map).then(res => {
           if (res.data.code == 200) {
-            // this.$router.push("/ship/cargoResult");
             this.$message({
               type: "success",
               message: "新增成功"
             });
           } else {
             this.$message({
+              type: "warning",
               message: res.data.data
             });
           }
@@ -226,11 +405,13 @@ export default {
 .shipTransport {
   .form {
     display: flex;
+
     .form_box {
       width: 320px;
       margin-left: 35%;
       margin-top: 30px;
       margin-right: 20px;
+
       .el-form {
         .preview-group {
           .el-form-item {
@@ -238,10 +419,12 @@ export default {
               display: inline-block;
               width: 70px !important;
             }
+
             .el-form-item__content {
               .el-select {
                 width: 250px;
               }
+
               .el-input {
                 width: 250px;
               }
@@ -251,23 +434,54 @@ export default {
       }
     }
   }
+
+  .mofrom {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 5px;
+    margin-right: 10px;
+
+    .motext {
+      width: 70px;
+    }
+
+    .moinput {
+      width: 250px;
+    }
+
+    .mobutton {
+      margin-left: 6px;
+    }
+  }
+
+  .button_box {
+    margin-left: 35%;
+  }
+
   .liulan {
+    margin-left: -4px;
     width: 120px;
     margin-top: 30px;
+
     .el-button {
-      width: 100px !important;
+
       margin: auto;
     }
+
     .btn {
       margin-top: 0px;
     }
+
     .btn1 {
       margin-top: 13px;
     }
+
     .btn2 {
       margin-top: 67px;
     }
   }
+
   .button_box {
     margin-left: 45%;
   }

src/views/appoint/components/ship/deliveryNotice.vue

@@ -14,34 +14,19 @@
       <!-- 未下发 -->
       <el-tab-pane label="未下发" name="first">
         <dilTable v-bind.sync="option1" ref="table">
-          <el-table-column
-            fixed="right"
-            align="center"
-            label="操作"
-            width="120"
-          >
+          <el-table-column fixed="right" align="center" label="操作" width="120">
             <template slot-scope="scope">
-              <el-button
-                @click="sendClick(scope.row.noticeId)"
-                type="text"
-                size="small"
-              >
+              <el-button @click="sendClick(scope.row.noticeId)" type="text" size="small">
                 下发
               </el-button>
-              <el-button
-                @click="modifyclick(scope.row.noticeId)"
-                type="text"
-                size="small"
-              >
+              <el-button @click="modifyclick(scope.row.noticeId)" type="text" size="small">
                 修改
               </el-button>
-              <el-button
-                @click="deleteclick(scope.row.noticeId)"
-                type="text"
-                size="small"
-              >
+              <el-button @click="deleteclick(scope.row.noticeId)" type="text" size="small">
                 删除
               </el-button>
+              <el-button @click="toPhotoClick(scope.row.noticeId)" type="text" size="small">
+                货权转移图片</el-button>
             </template>
           </el-table-column>
         </dilTable>
@@ -51,14 +36,26 @@
         <dilTable v-bind.sync="option2"> </dilTable>
       </el-tab-pane>
     </el-tabs>
+     <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>
   </div>
 </template>
-
 <script>
 export default {
   name: "homeworkPath",
   data() {
     return {
+      srcList:[],
+      isShow:false,
+      src:"",
       // restaurants: [],
       input: "",
       activeName: "first",
@@ -73,7 +70,7 @@ export default {
     };
   },
   methods: {
-    onclick() {},
+    onclick() { },
     addClick() {
       this.$router.push("/addDeliveryNotice/");
     },
@@ -108,6 +105,20 @@ export default {
           });
         });
     },
+
+
+    toPhotoClick(noticeId) {
+      this.axios
+        .post("/api/v1/tms/downLoadDeilveryNotice?noticeId=" + noticeId)
+        .then(res => {
+          console.log("res",res.data.data);
+          this.srcList = [];
+          this.src = res.data.data;
+          this.isShow = true;
+          this.srcList.push(res.data.data);
+        });
+    },
+
     handleClick(tab, event) {
       console.log(tab, event);
     },
@@ -149,6 +160,7 @@ export default {
 .shipTransport {
   .top {
     padding: 1.25rem 0.375rem;
+
     .el-input {
       width: 20%;
       margin-right: 40rpx;

src/views/appoint/components/ship/modifyDeliveryNotice.vue

@@ -1,12 +1,76 @@
 <template>
   <!-- 修改货权转移页面 -->
-    <div class="shipTransport">
+  <div class="shipTransport">
     <page-title>返回</page-title>
+    <div class="mofrom">
+      <span class="motext">物资</span>
+      <el-input class="moinput" v-model="materialName" disabled> </el-input>
+      <el-button class="mobutton" type="primary" @click="ondrawer(1)">浏览</el-button>
+    </div>
+    <!-- 货权转移送达单位 -->
+    <div class="mofrom">
+      <span class="motext">货权转移送达单位</span>
+      <el-input class="moinput" v-model="cargo" disabled> </el-input>
+      <el-button class="mobutton" type="primary" @click="ondrawer(2)">浏览</el-button>
+    </div>
+
+    <!--大品类 -->
+    <div class="mofrom">
+      <span class="motext">大品类</span>
+      <el-input class="moinput" v-model="materialType" disabled> </el-input>
+      <el-button class="mobutton" type="primary" @click="ondrawer(4)">浏览</el-button>
+    </div>
+
+    <!-- 货权转移送达单位 -->
+    <div class="mofrom">
+      <span class="motext">收货人</span>
+      <el-input class="moinput" v-model="receiver" disabled> </el-input>
+      <el-button class="mobutton" type="primary" @click="ondrawer(3)">浏览</el-button>
+    </div>
     <div class="form">
       <div class="form_box">
-          <dil-form :formId="143" v-model="form1"></dil-form>
-      </div>        
+        <dil-form :formId="112" v-model="form1"></dil-form>
+      </div>
     </div>
+
+    <!-- 模态框 -->
+    <el-drawer :visible.sync="drawer" :direction="direction" :before-close="handleClose" size="50%">
+      <el-input placeholder="请输入内容" v-model="input" style="margin-top: 10px; margin-left: 20px; width: 250px" clearable>
+      </el-input>
+      <el-button type="primary" class="btn" @click="onclick(a)" style="margin-bottom: 15px">
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <!-- <div v-show="a == 4">
+        <dilTable v-bind.sync="options" @radio-change="currentRadioChange6"></dilTable>
+      </div> -->
+      <div v-show="a == 1">
+        <dilTable v-bind.sync="second" @radio-change="currentRadioChange1"></dilTable>
+      </div>
+      <div v-show="a == 2">
+        <dilTable v-bind.sync="second1" @radio-change="currentRadioChange2"></dilTable>
+      </div>
+      <div v-show="a == 3">
+        <dilTable v-bind.sync="second2" @radio-change="currentRadioChange3"></dilTable>
+      </div>
+      <div v-show="a == 4">
+        <dilTable v-bind.sync="second3" @radio-change="currentRadioChange4"></dilTable>
+      </div>
+    </el-drawer>
+    <el-form :inline="true" class="demo-form-inline" label-width="80px" style="margin-left:450px;display:flex;">
+      <el-form-item label="上传货权转移附件">
+        <el-upload class="upload-demo" style="width:270px;" ref="upload1" action="/api/v1/rms/uploadCarrier1"
+          :before-upload="beforeUpload" :multiple="false" list-type="picture" :show-file-list="false"
+          :on-success="handleAvatarSuccess" :on-error="onError(1)">
+          <span class="span"></span>
+          <el-input class="shippingCertificate" style="width:270px;display:flex;" placeholder="请选择货权转移附件(必填项,可支持重新上传)"
+            v-model="shippingCertificate" disabled>
+          </el-input>
+          <el-button size="small" type="primary"
+            style="width:115px;height:35px;margin-left: 275px;margin-top:-35px;display:flex;" @click="upCLick(1)">
+            点击上传附件</el-button>
+        </el-upload>
+      </el-form-item>
+    </el-form>
     <!-- 确定和取消 -->
     <div class="button_box">
       <el-button @click="onClickCancel">返回</el-button>
@@ -18,58 +82,187 @@
 <script>
 import PageTitle from "@/components/Page/Title";
 import { sjTime } from "@/utils/sharedJsFile";
+import { getCookie } from "@/utils/util.js";
 export default {
   components: { PageTitle },
-    data(){
-          return {
-          form1: {},
-        }
-    },
+  data() {
+    return {
+      form1: {},
+      a: 1,
+      cargoPictureUrl: "",
+      shippingCertificate: "",
+      materialName: "",
+      materialType: "",
+      materialId:"",
+      cargo: "",
+      receiver: "",
+      input: "",
+      drawer: false,
+      direction: "rtl",
+      second: {
+        requestUrl: "/api/v1/uc/queryMaterialByLike?apiId=244",
+        selectionType: "radio",
+        mapList1: [],
+      },
+      second1: {
+        requestUrl: "/api/v1/tms/selectShippeByName?apiId=215",
+        selectionType: "radio",
+        mapList2: [],
+      },
+      second2: {
+        requestUrl: "/api/v1/tms/getGroupList?apiId=217",
+        selectionType: "radio",
+        mapList3: [],
+      },
+      second3: {
+        requestUrl: "/api/v1/rms/getMaterialTypeList?apiId=376",
+        selectionType: "radio",
+        mapList4: [],
+      },
+    }
+  },
   mounted() {
     this.information();
   },
   methods: {
     information() {
-      //编辑请车作业
       this.axios
         .post("/api/v1/tms/selectByNoticeId/" + this.$route.params.noticeId)
         .then((res) => {
           res.data.data.forEach((e) => {
-            this.form1 = e;
-            console.log(e);
-            console.log("aaa" +this.form1);
-            console.log(this.$route.params.pathId);
+            console.log("aaa",e);
+             this.form1 = e;
+             this.materialName=e.materialName;
+             this.materialId=e.materialId;
+             this.cargo=e.cargoName;
+             this.cargoId=e.cargoId;
+             this.shippingCertificate=e.cargoPictureUrl;
+             this.cargoPictureUrl=e.cargoPictureUrl;
+             this.receiver=e.reciveName;
+             this.materialType=e.materialType;
           });
-          
+
         });
-       
-        
     },
+    handleClose(done) {
+      done();
+    },
+    upCLick(val) {
+      this.num = val;
+    },
+    beforeUpload(file) {
+      this.upBool = true;
+      const isLt2M = file.size < 1024 * 1024 * 0.5;
+      if (!isLt2M) {
+        this.$message.error("上传文件大小不能超过500kb!");
+      } else {
+        let size = file.size / 1024;
+        let _URL = window.URL || window.webkitURL;
+        let img = new Image();
+        img.src = _URL.createObjectURL(file);
+      }
+      return isLt2M;
+    },
+    onError(err) {
+      if (this.upBool) {
+        if (this.num == 1) {
+          this.shippingCertificate = null;
+          this.cargoPictureUrl = null;
+          // this.$message.error("上传失败");
+        }
+      }
+    },
+    handleAvatarSuccess(res, file) {
+      // console.log("res",res.data)
+      if (res.code) {
+        this.upBool = false;
+        if (this.num == 1) {
+          this.cargoPictureUrl = res.data;
+          this.shippingCertificate = file.name;
+        }
+        this.$message.success("上传成功");
+      }
+    },
+
+    currentRadioChange() {
+      console.log(1);
+    },
+
+    ondrawer(num) {
+      this.drawer = true;
+      this.a = num;
+      // 清空当前输入框中的数据
+      this.input = "";
+    },
+    currentRadioChange1(selection) {
+      (this.second.mapList1 = selection),
+        (this.materialName = selection.materialName);
+        (this.materialId=selection.materialId);
+    },
+    currentRadioChange2(selection) {
+      (this.second1.mapList2 = selection), (this.cargo = selection.cargoName);
+    },
+    currentRadioChange3(selection) {
+      (this.second2.mapList3 = selection), (this.receiver = selection.pierName);
+    },
+    currentRadioChange4(selection) {
+      (this.second3.mapList4 = selection), (this.materialType = selection.materialTypeName);
+    },
+    onchange(val) { },
+    onclick(a) {
+      if (a == 1) {
+        this.second.requestUrl =
+          "/api/v1/uc/queryMaterialByLike?apiId=244&index=" + this.input;
+      } else if (a == 2) {
+        this.second1.requestUrl =
+          "/api/v1/tms/selectShippeByName?apiId=215&con=" + this.input;
+      } else if (a == 3) {
+        this.second2.requestUrl =
+          "/api/v1/tms/getGroupList?apiId=217&con=" + this.input;
+      } else if (a == 4) {
+        // console.log("aaaa");
+        this.second3.requestUrl =
+          "/api/v1/rms/getMaterialTypeList?apiId=376&con=" + this.input;
+      }
+    },
+
     // 确认
     onClickConfirm() {
-      let AmsshipDeliveryNotice = {
+      let map = {
         noticeId: this.$route.params.noticeId,
-        requesterGroupId:this.form1.requesterGroupId,
-        carrierId:this.form1.carrierId,
-        noticeCommerceMethod:this.form1.noticeCommerceMethod,
-        noticeHandoverMethod:this.form1.noticeHandoverMethod,
-        portId:this.form1.portId,
-        noticePortConstructionFee:this.form1.noticePortConstructionFee,  
-         noticeDeliveryTime:sjTime(
-            this.form1.noticeDeliveryTime
-          ),
-        noticePileFreeDays:this.form1.noticePileFreeDays,
-        materialCapacityName:this.form1.materialCapacityName,
-        noticeDistrbutionStatus:this.form1.noticeDistrbutionStatus,
-        batchId:this.form1.batchId,
-        purchaseContractUnitPrice:this.form1.purchaseContractUnitPrice,
-        purchaseContractMoisture:this.form1.purchaseContractMoisture,
-        tfeContent:this.form1.tfeContent,
-        silicaContent:this.form1.silicaContent,
-        aluminaContent:this.form1.aluminaContent,
-        phosphorusContent:this.form1.phosphorusContent,
-        manganeseContent:this.form1.manganeseContent,
-     };
+        carrierId: this.form1.carrierId,
+        requesterGroupId: this.form1.requesterGroupId,
+        noticeCommerceMethod: this.form1.noticeCommerceMethod,
+        noticeHandoverMethod: this.form1.noticeHandoverMethod,
+        portId: this.form1.portId,
+        noticePortConstructionFee: this.form1.noticePortConstructionFee,
+        noticeDeliveryTime: sjTime(this.form1.noticeDeliveryTime),
+        noticePileFreeDays: this.form1.noticePileFreeDays,
+        // batchId: this.batchId,
+        purchaseContractUnitPrice: this.form1.purchaseContractUnitPrice,
+        purchaseContractMoisture: this.form1.purchaseContractMoisture,
+        //微元素含量
+        tfeContent: this.form1.tfeContent,
+        silicaContent: this.form1.silicaContent,
+        aluminaContent: this.form1.aluminaContent,
+        phosphorusContent: this.form1.phosphorusContent,
+        manganeseContent: this.form1.manganeseContent,
+        resultContactPerson: this.form1.resultContactPerson,
+        resultTelephoneFax: this.form1.resultTelephoneFax,
+        resultFreightForwardingInfo: this.form1.resultFreightForwardingInfo,
+        resultMemo: this.form1.resultMemo,
+        resultNumberOfLoans: this.form1.resultNumberOfLoans,
+        cargoId: this.second1.mapList2.cargoId,
+        groupId: this.second2.mapList3.id,
+        inFactoryShipName: this.form1.inFactoryShipName,
+        foreignShipName: this.form1.foreignShipName,
+        materialId: this.materialId,
+        materialTypeId: this.second3.mapList4.materialTypeId,
+        isNeedPortDisCharge: this.form1.isNeedPortDisCharge,
+        isNeedPortFee: this.form1.isNeedPortFee,
+        cargoPictureUrl: this.cargoPictureUrl,
+        userId: getCookie("userId"),
+      };
 
       // function isNumber() {
       //   var value = AmsshipCargoTransferResult.resultTelephoneFax;
@@ -89,49 +282,58 @@ export default {
       // else
       // if (!isNumber(val)) this.$message.error("联系电话必须是数字！");
       // else
-      console.log("AmsshipDeliveryNotice",AmsshipDeliveryNotice);
+  
       this.axios
-        .post("/api/v1/tms/editDeliveryNotice" ,AmsshipDeliveryNotice
+        .post("/api/v1/tms/editDeliveryNotice", map
         )
-        .then(() => {
+        .then((res) => {
+          if(res.data.code=="200"){
           this.$message({
-            type: "success",  
+            type: "success",
             message: "修改成功!",
           });
           this.$router.go(-1);
-        });   
+          }
+           else{
+            this.$message.error("修改失败！！")
+          }
+        });
     },
-      // 返回
+    // 返回
     onClickCancel() {
       this.$router.go(-1);
     },
   },
-  
+
 };
 
 
 </script>
 <style lang="scss">
-.shipTransport{
-  .form{
+.shipTransport {
+  .form {
     display: flex;
-    .form_box{
+
+    .form_box {
       width: 320px;
       margin-left: 35%;
       margin-top: 30px;
       margin-right: 20px;
-      .el-form{
-        .preview-group{
-          .el-form-item{
-            .el-form-item__label{
+
+      .el-form {
+        .preview-group {
+          .el-form-item {
+            .el-form-item__label {
               display: inline-block;
               width: 70px !important;
             }
-            .el-form-item__content{
-              .el-select{
+
+            .el-form-item__content {
+              .el-select {
                 width: 250px;
               }
-              .el-input{
+
+              .el-input {
                 width: 250px;
               }
             }
@@ -140,7 +342,28 @@ export default {
       }
     }
   }
-  .button_box{
+  .mofrom {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin-top: 5px;
+    margin-right: 10px;
+
+    .motext {
+      width: 70px;
+    }
+
+    .moinput {
+      width: 250px;
+    }
+
+    .mobutton {
+      margin-left: 6px;
+    }
+  }
+
+
+  .button_box {
     margin-left: 45%;
   }
 }

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

@@ -59,7 +59,7 @@
      <vxe-modal width="549px" height="731px" v-model="isShow" show-footer>
       <div class="demo-image__preview">
         <el-image
-          style=" height:731px;text-align:center"
+          style=" height:731px;text-align:center;"
           :src="src"
           :preview-src-list="srcList"
         >
@@ -199,7 +199,6 @@ export default {
     },
     exportData(){
         
-
         let tHeader = [];
         let filterVal = [];
         if(this.activeName=="first"){

src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelNewMonitor.vue

@@ -2,6 +2,11 @@
 <template>
   <div class="purchasFuelNewMonitor">
     <div class="frameCalculation">
+      <el-input
+        v-model="input"
+        style="width:210px;display:flex;margin-right:90px;"
+        placeholder="请输入条件查询"
+      ></el-input>
       <span>计毛时间：</span>
       <el-date-picker
         v-model="startTime"
@@ -10,23 +15,30 @@
       >
       </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-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="exportData()"
+        ><i class="el-icon-download"></i>导出(Excel)</el-button
+      >
       <el-button type="primary" @click="refresh">
         <i class="el-icon-refresh"></i>刷新
       </el-button>
-      <span style="margin-left: 1rem;">合计净重：</span>
-      <el-input v-model="totalNumber" :disabled="true" style="width: 150px;"></el-input>
-      <span style="margin-left: 1rem;">合计车数：</span>
-      <el-input v-model="totalCapacity" :disabled="true" style="width: 150px;"></el-input>
+      <span style="margin-left: 1rem">合计净重：</span>
+      <el-input
+        v-model="totalNumber"
+        :disabled="true"
+        style="width: 150px"
+      ></el-input>
+      <span style="margin-left: 1rem">合计车数：</span>
+      <el-input
+        v-model="totalCapacity"
+        :disabled="true"
+        style="width: 150px"
+      ></el-input>
     </div>
     <div class="table">
       <dilTable ref="excelDom" v-bind.sync="option" @func="func"></dilTable>
@@ -35,12 +47,15 @@
 </template>
 
 <script>
-import { sjTime } from '@/utils/sharedJsFile'
+import { sjTime } from "@/utils/sharedJsFile";
 export default {
   data() {
     return {
+      input: null,
       option: {
-        requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=7&startTime=null&endTime=null&i=" +new Date(),
+        requestUrl:
+          "/api/v1/tms/getRLFLReport?apiId=382&orderType=7&startTime=null&endTime=null&i=" +
+          new Date()
       },
       startTime: null,
       endTime: null,
@@ -48,20 +63,20 @@ export default {
       totalNumber: 0,
       //合计车数
       totalCapacity: 0,
-      tableTitle:'采购燃料新区统计报表'
+      tableTitle: "采购燃料新区统计报表"
     };
   },
   methods: {
-    refresh(){
+    refresh() {
       this.$router.go(0);
     },
-    func(res){
-      console.log(res)
-      var resultNetWeightTotal = 0
+    func(res) {
+      console.log(res);
+      var resultNetWeightTotal = 0;
       res.list.forEach(e => {
-        resultNetWeightTotal = resultNetWeightTotal+e.resultNetWeight
+        resultNetWeightTotal = resultNetWeightTotal + e.resultNetWeight;
       });
-      this.totalNumber = resultNetWeightTotal.toFixed(2) + " t"
+      this.totalNumber = resultNetWeightTotal.toFixed(2) + " t";
       this.totalCapacity = res.total;
       //获取总记录条数作为合计车数
       // this.totalCapacity = res.total;
@@ -70,25 +85,41 @@ export default {
     onclick() {
       let startTime = null;
       let endTime = null;
-      if(this.startTime){
+      if (this.startTime) {
         startTime = sjTime(this.startTime);
       }
-      if(this.endTime){
+      if (this.endTime) {
         endTime = sjTime(this.endTime);
       }
-      if(startTime && endTime){
-        if(startTime < endTime){
-          this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=7&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
-        }else{
+      if (startTime && endTime) {
+        if (startTime < endTime) {
+          this.option.requestUrl =
+            "/api/v1/tms/getRLFLReport?apiId=382&orderType=7&startTime=" +
+            startTime +
+            "&endTime=" +
+            endTime +
+            "&con=" +
+            this.input +
+            "&i=" +
+            new Date();
+        } else {
           this.startTime = null;
           this.endTime = null;
-          this.$message.warning('开始时间要比结束时间早')
+          this.$message.warning("开始时间要比结束时间早");
         }
-      }else{
-        this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=7&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+      } else {
+        this.option.requestUrl =
+          "/api/v1/tms/getRLFLReport?apiId=382&orderType=7&startTime=" +
+          startTime +
+          "&endTime=" +
+          endTime +
+          "&con=" +
+          this.input +
+          "&i=" +
+          new Date();
       }
-    },
-  },
+    }
+  }
 };
 </script>
 
@@ -99,10 +130,10 @@ export default {
     height: 100px;
     display: flex;
     align-items: center;
-    padding-left: 50px;
-    .el-date-editor{
+    padding-left: 100px;
+    .el-date-editor {
       margin: 20px;
     }
   }
 }
-</style>
+</style>

src/views/statisticalReport/components/purchasFuelMonitor/purchasFuelOldMonitor.vue

@@ -2,6 +2,7 @@
 <template>
   <div class="purchasFuelOldMonitor">
     <div class="frameCalculation">
+      <el-input v-model="input" style="width:210px;display:flex;margin-right:90px;" placeholder="请输入条件查询"></el-input>
       <span>计毛时间：</span>
       <el-date-picker
         v-model="startTime"
@@ -39,6 +40,7 @@ import { sjTime } from '@/utils/sharedJsFile'
 export default {
   data() {
     return {
+      input:null,
       option: {
         requestUrl: "/api/v1/tms/getRLFLReport?apiId=382&orderType=6&startTime=null&endTime=null&i=" +new Date(),
       },
@@ -78,14 +80,14 @@ export default {
       }
       if(startTime && endTime){
         if(startTime < endTime){
-          this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=6&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+          this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=6&startTime=" + startTime + "&endTime=" + endTime + "&con=" + this.input+ "&i=" +new Date();
         }else{
           this.startTime = null;
           this.endTime = null;
           this.$message.warning('开始时间要比结束时间早')
         }
       }else{
-        this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=6&startTime=" + startTime + "&endTime=" + endTime + "&i=" +new Date();
+        this.option.requestUrl = "/api/v1/tms/getRLFLReport?apiId=382&orderType=6&startTime=" + startTime + "&endTime=" +  "&con=" + this.input + endTime + "&i=" +new Date();
       }
     },
   },