前端孟祥旭

src/api/V2/financialManagement/index.js

@@ -3,6 +3,8 @@ export const API_GET_CAIWU_LIST= '/collectionManagement/selectCollectionInfo'
 //派发
 export const API_POST_PAIFA_LIST = '/collectionManagement/distribute'
 //查库管
-export const API_GET_KUGUAN_LIST = '/staff/query/staffsByRole'
+export const API_GET_KUGUAN_LIST = '/commonSysParameter/getStaffInfo'
 //派车查看
-export const API_GET_CHAKAN_LOOK = '/warehouseInOutInfo/selectDistributeCar'
+export const API_GET_CHAKAN_LOOK = '/warehouseInOutInfo/selectDistributeCar'
+//删除
+export const API_POST_DEL_LIST = '/collectionManagement/deleteCar'

src/model/financialManagement/index.js

@@ -5,12 +5,15 @@ import {
     API_POST_PAIFA_LIST,
     API_GET_KUGUAN_LIST,
     API_GET_CHAKAN_LOOK,
+    API_POST_DEL_LIST,
 } from '@/api/V2/financialManagement'
 //采购详情列表
 export const caiwuList = appRx.get(API_GET_CAIWU_LIST, errorCatcher, errorHandle, filter)
 // 派发
 export const paifa = appRx.post(API_POST_PAIFA_LIST, errorCatcher , errorHandle, filter)
 //查库管
-export const kuguan = appRx.get(API_GET_KUGUAN_LIST, errorCatcher, errorHandle,filter)
+export const kuguan = appRx.get(API_GET_KUGUAN_LIST, errorCatcher, errorHandle, filter)
 //派车查看
-export const paiLook = appRx.get(API_GET_CHAKAN_LOOK, errorCatcher, errorHandle,filter)
+export const paiLook = appRx.get(API_GET_CHAKAN_LOOK, errorCatcher, errorHandle, filter)
+//删除
+export const carDel = appRx.post(API_POST_DEL_LIST,errorCatcher, errorHandle,filter)

src/views/financialManagement/collectionManagementList.vue

@@ -52,7 +52,7 @@
     >
       <el-table-column type="index" label="序号">
         <template scope="scope">
-          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-if="scope.$index < 9">{{ scope.$index + 1 }}</span>
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
@@ -67,60 +67,6 @@
       <el-table-column class="table_td" prop="alreadyInvoice" label="已开发票(元)"></el-table-column>
       <el-table-column class="table_td" prop="notInvoice" label="未开发票(元)"></el-table-column>
       <el-table-column prop="status" label="状态">
-        <!-- <template slot-scope="scope">
-          <el-popover
-            placement="left"
-            :width="285"
-            trigger="click"
-            visible-arrow="false"
-            @show="history(scope.row)"
-          >
-            <template>
-              <span slot="reference">
-                <span
-                  v-if="scope.row.status == '待执行'"
-                  class="executory"
-                ></span>
-                <span
-                  v-if="scope.row.status == '执行中'"
-                  class="inExecution"
-                ></span>
-                <span v-if="scope.row.status == '已完成'" class="done"></span
-                >{{ scope.row.status }}
-              </span>
-            </template>
-            <div>
-              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
-              <div
-                v-for="(item, index) in historyList"
-                :key="index"
-                class="flex"
-              >
-                <div class="vertical-text vertical-text-left">
-                  {{ item.updateDate }}
-                </div>
-                <div>
-                  <div class="vertical-circle"></div>
-                  <div
-                    v-if="index != historyList.length - 1"
-                    class="vertical-line"
-                  ></div>
-                </div>
-                <div class="vertical-text">
-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
-                </div>
-              </div>
-            </div>
-          </el-popover>
-          <img
-            width="17"
-            height="18"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/edit.png"
-            @click="editClick(scope.row)"
-            alt=""
-          />
-        </template>-->
       </el-table-column>
       <el-table-column class="table_td" prop="updateDate" label="更新时间"></el-table-column>
       <el-table-column prop="seller" label="操作" width="200">
@@ -137,37 +83,73 @@
       layout="total, sizes, prev, pager, next, jumper"
       :total="deptBudgetTotal"
     ></el-pagination>
-   <el-dialog width="60%" title="派发()" :visible.sync="dialogFormVisible2" :append-to-body="true">
-      <el-form :data="warehouseList" ref="warehouseList">
-        <el-form-item label="默认库管" :label-width="formLabelWidth">
+    <el-dialog width="60%" :visible.sync="dialogFormVisible2" :append-to-body="true">
+      <el-form>
+        <el-form-item label="派发" :label-width="formLabelWidth">({{paifaDialogForm.contractNo}})</el-form-item>
+        <el-form-item label="默认库管" prop="agent" :label-width="formLabelWidth">
           <el-select
-            v-model="warehouseList.agent"
+            v-model="agent"
             autocomplete="off"
             placeholder="请选择默认库管"
             class="deal"
-          ></el-select>
+            filterable
+            :filter-method="dataFilter"
+            @change="selectstaff"
+          >
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.staffName"
+              :value="item.staffName"
+            />
+          </el-select>
         </el-form-item>
-        <div v-for="(item, index) in freightspace" :key="index">
-          <el-form-item label="编号" prop="tranCarNo" :label-width="formLabelWidth">
-           {{item.tranCarNo}}
-          </el-form-item>
-          <el-form-item label="车牌号" prop="carNo" :label-width="formLabelWidth" class="car">
-            <el-input v-model="item.carNo" autocomplete="off" placeholder="请输入车牌号" class="deall"></el-input>
-          </el-form-item>
-          <el-form-item label="箱号" prop="boxNo" :label-width="formLabelWidth" class="boxno">
-            <el-input v-model="item.boxNo" autocomplete="off" placeholder="请输入箱号" class="deaee"></el-input>
-          </el-form-item>
-          <el-form-item label="封号" prop="titleNo" :label-width="formLabelWidth" class="fengno">
-            <el-input v-model="item.titleNo" autocomplete="off" placeholder="请输入封号" class="dea"></el-input>
-          </el-form-item>
-          <el-form-item label="库管" prop="agent" :label-width="formLabelWidth" class="kug">
-            <el-input disabled v-model="item.agent" autocomplete="off" placeholder class="deaa"></el-input>
-          </el-form-item>
-          <el-button class="bott" @click="add1()">新增</el-button>
-          <!-- <el-button class="bot" @click="del()">删除</el-button> -->
-          <hr>
-        </div>
+         <div style="text-align: left; color: #8890b1; font-size: 16px; margin-left: 309px; margin-top: -21px;">
+           共 {{ total }} 车，发 {{  current }} 辆
+          </div> 
+        <el-table :data="freightspace" style="width: 100%" height="560">
+          <el-table-column prop="tranCarNo" label="编号" width="180"></el-table-column>
+          <el-table-column prop="carNo" label="车牌号" width="180">
+            <template slot-scope="scope">
+              <el-input
+                :disabled="scope.$index != 0"
+                @input="changeCarNo($event)"
+                :value="scope.row.carNo"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column prop="boxNo" label="箱号">
+            <template slot-scope="scope">
+              <el-input
+                :disabled="scope.$index != 0"
+                @input="changeBoxNo($event)"
+                :value="scope.row.boxNo"
+              />
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="titleNo" label="封号">
+            <template slot-scope="scope">
+              <el-input
+                :disabled="scope.$index != 0"
+                @input="changeTitleNo($event)"
+                :value="scope.row.titleNo"
+              />
+            </template>
+          </el-table-column>
 
+          <el-table-column prop="agent" label="库管"></el-table-column>
+          <el-table-column fixed="right" label="操作" width="100">
+            <template slot-scope="scope">
+              <el-button @click="add1(scope.row)" v-if="scope.$index == 0">新增</el-button>
+              <el-button
+                @click="del(scope.row)"
+                v-else-if="scope.$index > 0 && scope.row.tranFlag==0"
+              >删除</el-button>
+              <span v-else-if="scope.$index > 0 && scope.row.tranFlag==1">已发车</span>
+            </template>
+          </el-table-column>
+        </el-table>
       </el-form>
     </el-dialog>
   </div>
@@ -177,7 +159,8 @@ import {
   caiwuList,
   paifa,
   kuguan,
-  paiLook
+  paiLook,
+  carDel
 } from '@/model/financialManagement/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
@@ -199,6 +182,8 @@ export default {
   },
   data() {
     return {
+      paifaDialogForm: {},
+      paifaKuguanList: [],
       //弹出框
       dialogViewSpareMoney: false,
       dialogApproveFormVisible: false,
@@ -230,16 +215,16 @@ export default {
         boxNo: '',
         titleNo: '',
         tranCarNo: '',
-        agent: ''
+        agent: []
       },
       list: [],
+      agent: [],
       collectionManagement: {},
       freightspace: [
         {
           carNo: '',
           boxNo: '',
           titleNo: '',
-          titleNo: '',
           tranCarNo: '',
           agent: ''
         }
@@ -249,11 +234,11 @@ export default {
       titleNo: '',
       tranCarNo: '',
       agent: '',
-      tranCarNo: '',
       planId: '',
-      goodsname: '',
-      contracNo: '',
-
+      staffId: '',
+      goodsName: '',
+      contractNo: '',
+      options: [],
       startDate: null,
       endDate: null,
       addressUrls: [],
@@ -266,6 +251,7 @@ export default {
         year: dayjs().format('YYYY'),
         month: dayjs().format('MM')
       },
+      id: '',
       contractList: [],
       deptBudgetList: {},
       historyList: [],
@@ -286,21 +272,58 @@ export default {
         { value: '全部', type: '' }
       ],
       value1: '',
-      value2: ''
+      value2: '',
+      index: 1
     }
   },
   activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
     this.getList()
     this.showType = this.isShow
   },
+  computed: {
+    total: function () {
+      if (this.freightspace.length > 0) {
+        var maxStorage = 0
+        for (var i = 0; i < this.freightspace.length; i++) {
+          maxStorage =(this.freightspace.length-1)
+        }
+        return maxStorage
+      }
+    },
+    current: function () {
+      if (this.freightspace.length > 0) {
+        var maxStorage = 0
+        for (var i = 0; i < this.freightspace.tranFlag; i++) {
+           maxStorage =(this.freightspace.tranFlag.length)
+         
+        }
+        return maxStorage
+      }
+    },
+  },
   methods: {
-    table_index(index){
-        return (this.paginations.page_index-1) * this.paginations.page_size + index + 1
-    },  
+    changeCarNo(e) {
+      this.$forceUpdate()
+      this.freightspace[0].carNo = e
+    },
+    changeBoxNo(e) {
+      this.$forceUpdate()
+      this.freightspace[0].boxNo = e
+    },
+    changeTitleNo(e) {
+      this.$forceUpdate()
+      this.freightspace[0].titleNo = e
+    },
     dianlog(item) {
+      this.paifaDialogForm.contractNo = item.contractNo
+      this.planId = item.planId
+      this.goodsName = item.goodsName
+      this.contractNo = item.contractNo
+      this.buyer = item.buyer
+      this.tranCarNo = item.tranCarNo
+      this.staffId = item.staffId
+
+      var tranCarNos = ''
       this.dialogFormVisible2 = true
       this.dataList = item
       paiLook({
@@ -308,14 +331,54 @@ export default {
       })
         .toPromise()
         .then(response => {
+          // this.index = response.length + 1
           this.freightspace = response
+          this.freightspace.unshift({
+            carNo: '',
+            boxNo: '',
+            titleNo: '',
+            tranCarNo: '',
+            agent: ''
+          })
+          for (var i = 0; i < this.freightspace.length; i++) {
+            var index = i + 1
+            this.freightspace[this.freightspace.length - 1 - i].tranCarNo =
+              'C00' + index
+          }
+        })
+
+      this.staffQO.roleId = 'd6a5c8a52da544309259f91f75de1ec6'
+      kuguan(this.staffQO)
+        .toPromise()
+        .then(response => {
+          console.log('成功')
+          // this.paifaKuguanList = response
+          this.options = response
+
+          // this.staffList = response
+        })
+    },
+    refresh() {
+      paiLook({
+        contractNo: this.dataList.contractNo
+      })
+        .toPromise()
+        .then(response => {
+          // this.index = response.length + 1
+          this.freightspace = response
+          this.freightspace.unshift({
+            carNo: '',
+            boxNo: '',
+            titleNo: '',
+            tranCarNo: '',
+            agent: ''
+          })
+          for (var i = 0; i < this.freightspace.length; i++) {
+            var index = i + 1
+            this.freightspace[this.freightspace.length - 1 - i].tranCarNo =
+              'C00' + index
+          }
         })
-      // this.staffQO.roleId = 'd6a5c8a52da544309259f91f75de1ec6'
-      // kuguan(this.staffQO)
-      //   .toPromise()
-      //   .then(response => {
-      //     console.log('成功')
-      //   })
     },
     dateFormat(fmt, date) {
       let ret
@@ -339,7 +402,34 @@ export default {
       }
       return fmt
     },
-
+    dataFilter(val) {
+      this.warehouseList.personCharge = val
+      if (val) {
+        console.log(val)
+        this.options = this.staffList.filter(item => {
+          if (
+            !!~item.staffName.indexOf(val) ||
+            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
+      } else {
+        this.options = this.staffList
+      }
+    },
+    selectstaff(e) {
+      this.freightspace[0].agent = e
+      for (var i = 0; i < this.options.length; i++) {
+        if (this.options[i].staffName == e) {
+          // this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
+          // this.deptBudgetList.tranCarInfoList[0].driverPhone =
+          //   this.staffList[i].staffMobilePhone
+          this.staffId = this.options[i].staffId
+        }
+      }
+      console.log(this.staffId, 'dvsgd')
+    },
     handleClose() {
       this.dialogViewSpareMoney = false
     },
@@ -356,6 +446,34 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
+    del(row) {
+      this.id = row.id
+      var del = ' '
+      // if (row.del == '') {
+      // }
+      this.$confirm(`删除后不可恢复，是否确定删除？`, {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning'
+      })
+        .then(() => {
+          carDel({ id: this.id })
+            .toPromise()
+            .then(response => {
+              this.$notify.success({
+                title: '成功',
+                message: '删除成功'
+              })
+              this.refresh()
+            })
+            .catch(response => {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+        })
+        .catch(() => {
+          return false
+        })
+    },
     getList() {
       caiwuList({
         compId: sessionStorage.getItem('ws-pf_compId'),
@@ -372,87 +490,85 @@ export default {
           this.warehouseList = response
         })
     },
-    del(index) {
-      if (this.freightspace.length > 1) {
-        this.freightspace.splice(index, 1)
-      }
-    },
-    add1() {
-      for(var i = 0; i<this.warehouseList.length;i++) {
-          if(!this.warehouseList[i].carNo) {
-        this.$message({
-          message:'车牌号不能为空',
-          type:'warning',
-        })
-        return
-      }
-      if(this.warehouseList.carNo.length <=7) {
-        this.$message({
-          message:'车牌号输入有误',
-          type:'warning',
-        })
-      }
-      if(!this.warehouseList.boxNo.length <1 || this.warehouseList.boxNo.length >15 ) {
-        this.$message({
-          message:'箱号输入错误',
-          type:'warning',
-        })
-        return
-      }
-      if(!this.warehouseList.boxNo) {
-        this.$message({
-          message:'箱号不能为空',
-          type:'warning',
-        })
-        return
-      }
-      if(this.warehouseList.titleNo.length<1 || this.warehouseList.titleNo.length>15) {
-        this.$message({
-          message:'封号输入错误',
-          type:'warning',
-        })
-        return
-      }
-      if(!this.warehouseList.titleNo) {
-        this.$message({
-          message:'封号不能为空',
-          type:'warning',
-        })
-        return
-      }
-      if(!this.warehouseList.agent) {
-        this.$message({
-          message:'库管不能为空',
-          type:'warning',
-        })
-        return
-      }
-      }
-      
-      console.log(1111)
-      this.freightspace.push({
+    // del(index) {
+    //   if (this.freightspace.length > 1) {
+    //     this.freightspace.splice(index, 1)
+    //   }
+    // },
+    add1(item) {
+      // if (!this.freightspace[0].carNo) {
+      //   this.$message({
+      //      message: '车牌号不能为空',
+        //      type: 'warning'
+      //   })
+      //   return
+      // }
+      // if (this.freightspace.carNo.length <= 7) {
+      //   this.$message({
+      //     message: '车牌号输入有误',
+      //     type: 'warning'
+      //   })
+      //   return
+      // }
+      // if (
+      //   !this.freightspace.boxNo.length < 1 ||
+      //   this.freightspace.boxNo.length > 15
+      // ) {
+      //   this.$message({
+      //     message: '箱号输入错误',
+      //     type: 'warning'
+      //   })
+      //   return
+      // }
+      // if (!this.freightspace[0].boxNo) {
+      //   this.$message({
+      //     message: '箱号不能为空',
+      //     type: 'warning'
+      //   })
+      //   return
+      // }
+      // if (
+      //   this.freightspace.titleNo.length < 1 ||
+      //   this.freightspace.titleNo.length > 15
+      // ) {
+      //   this.$message({
+      //     message: '封号输入错误',
+      //     type: 'warning'
+      //   })
+      //   return
+      // }
+      // if (!this.freightspace[0].titleNo) {
+      //   this.$message({
+      //     message: '封号不能为空',
+      //     type: 'warning'
+      //   })
+      //   return
+      // }
+
+      console.log(this.planId)
+      var tmp = this.freightspace[0].agent
+      var tmp1 = this.freightspace.length + 1
+      this.freightspace.unshift({
         carNo: '',
         boxNo: '',
         titleNo: '',
-        tranCarNo: '',
-        agent: '',
-        planId: '',
-        contracNo: '',
-        goodsname: '',
-        buyer: ''
+        planId: this.planId,
+        staffId: this.staffId,
+        goodsName: this.goodsName,
+        buyer: this.buyer,
+        tranCarNo: 'C00' + tmp1,
+        agent: tmp
       })
-      this.collectionManagement.collectionManagementList = this.freightspace
-      this.collectionManagement.compId = sessionStorage.getItem('ws-pf_compId')
-      this.collectionManagement.buyer = this.dataList.buyer
-      this.collectionManagement.planId = this.dataList.planId
-      this.collectionManagement.contractNo = this.dataList.contractNo
-      this.collectionManagement.goodsname = this.dataList.goodsname
-      return
-      paifa(this.collectionManagement)
+      item.planId = this.planId
+      item.goodsName = this.goodsName
+      item.buyer = this.buyer
+      item.contractNo = this.contractNo
+      item.staffId = this.staffId
+
+      paifa(item)
         .toPromise()
-        .then(response => {
-          this.warehouseList = response
-        })
+        .then(response => {})
+      this.freightspace = response
     },
     editClick(row) {
       var status = ''
@@ -491,7 +607,22 @@ export default {
         }
       }
     },
-
+     find() {
+      if (this.inOutDate != null) {
+        if (this.inOutDate.length > 0) {
+          this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+          this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+        } else {
+          this.startDate = ''
+          this.endDate = ''
+        }
+      }else{
+        this.startDate = ''
+          this.endDate = ''
+      }
+      this.currentPage = 1
+      this.getList()
+    },
     // 关闭 dialog时 处理文件url 初始化upload组件
     handleCloe() {
       this.dialogViewSpareMoney = false
@@ -504,17 +635,6 @@ export default {
           this.historyList = response
         })
     },
-    find() {
-      if (this.value2) {
-        this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-        this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-      } else {
-        this.startDate = ''
-        this.endDate = ''
-      }
-      this.currentPage = 1
-      this.getList()
-    },
     async exportlist() {
       const { data } = await export1(
         {
@@ -537,37 +657,6 @@ export default {
           (this.date.month ? `-${this.date.month}` : '')}_采购合同`,
         type: 'xls'
       })
-    },
-    // deletecontract(){},
-    //删除
-    handleDelete(row) {
-      var text = ''
-      //   if (row.deliverType == 1) {
-      //     text =
-      //       '删除该合同将同时永久删除合同对应的临时仓库相关数据，是否确定删除？'
-      //   } else {
-      //     text = '合同删除后不可恢复，是否继续删除？'
-      //   }
-      this.$confirm('合同删除后不可恢复，是否继续删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          deletecontract({ id: row.id })
-            .toPromise()
-            .then(response => {
-              this.$notify.success({
-                title: '成功',
-                message: '删除成功'
-              })
-              this.getList()
-            })
-            .catch(response => {})
-        })
-        .catch(() => {
-          return false
-        })
     }
   }
 }
@@ -901,7 +990,7 @@ export default {
   margin-top: -39px;
 }
 .deaee {
-   width: 120px;
+  width: 120px;
 }
 .fengno {
   width: 100px;
@@ -922,4 +1011,19 @@ export default {
 .bott {
   margin-left: 957px;
 }
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
+.base_header_layout .grid-content.right .find.el-button--primary {
+  width: 30px;
+  margin-left: -10px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  margin-top: 0px;
+}
 </style>

src/views/purchasingManagement/purchaseOrderList.vue

@@ -1,38 +1,53 @@
-//采购详情
+//采购订单
 <template>
   <div class="container">
-<el-row>
-      <el-col :span="12">
-          <ws-button type="primary" @click="dialogVisible = true">全部订单</ws-button>
-          <ws-button type="primary" @click="handleAdd()">待审核</ws-button>
-          <ws-button type="primary" @click="handleAdd()">执行中</ws-button>
-          <ws-button type="primary" @click="handleAdd()">已完成</ws-button>
-      </el-col>
-      <el-col :span="12" class="bg-right">
+<BaseHeaderLayout :leftSpan="10">
+      <template slot="left">
+         <span style="width: 70px; display: inline-block; color: #8890b1"
+          >状态：</span
+        >
+        <ws-select
+          v-model="searchTypeText"
+          placeholder
+          class="typeselect"
+          @change="selecttaskType"
+          :value="searchType"
+        >
+        <ws-option
+          v-for="item in taskTypeList"
+          :key="item.value"
+          :label="item.value"
+          :value="item.value"
+          style="color:#8890b1"
+        />
+        </ws-select>
+      </template>
+      <!-- 接单开始 -->
+      <template slot="right">
+      
         <ws-input
-            v-model="searchKeyWord"
-            placeholder="可按照合同编号和任务编号进行查找"
-            clearable
-            maxlength="500"
-            type="input"
-            class="findValue"
-          ></ws-input>
-          <ws-button class="but" type="primary" @click="find()">
-            <img
-              width="16"
-              height="16"
-              style="
+          v-model="searchKeyWord"
+          placeholder="可按采购计划编号和标题查找"
+          clearable
+          maxlength="500"
+          type="input"
+          class="findValue"
+        ></ws-input>
+        <ws-button class="find" type="primary" @click="find()"
+          ><img
+            width="16"
+            height="16"
+            style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
             "
-              src="../../../public/img/sousuo.png"
-              alt
-            />
-          </ws-button>
-      </el-col>
-    </el-row>
+            src="../../../public/img/sousuo.png"
+            alt=""
+        /></ws-button>
+      </template>
+    </BaseHeaderLayout>
         <el-table
           :data="warehouseList.records"
           size="small"
@@ -47,7 +62,7 @@
           <el-table-column class="table_td" prop="procurementPlan" label="采购计划"></el-table-column>
           <el-table-column class="table_td" prop="customer" label="客户">
             <template slot-scope="scope">
-              <el-button class="record" @click="customer(scope.row)">{{scope.row.customer}}</el-button>
+              <div class="record" @click="customer(scope.row)">{{scope.row.customer}}</div>
             </template>
           </el-table-column>
           <el-table-column class="table_td"  width="100" prop="unitPrice" label="单价(元/吨)">
@@ -72,20 +87,20 @@
 <span v-if='!scope.row.basis'>-</span>
             </template>
           </el-table-column>
-          <el-table-column class="table_td" prop="freezingDeposit" label="冻结定金(元)"></el-table-column>
-          <el-table-column class="table_td" prop="defaultDeposit" label="拖欠定金(元)"></el-table-column>
+          <el-table-column class="table_td" prop="freezingDeposit" label="冻结定金(元)" width="100px"></el-table-column>
+          <el-table-column class="table_td" prop="defaultDeposit" label="拖欠定金(元)" width="100px"></el-table-column>
           <el-table-column  width="100" class="table_td" prop="unloadingCharge" label="卸车费(元/吨)"></el-table-column>
           <el-table-column  width="100" class="table_td" prop="invoiceFee" label="发票费(元/吨)"></el-table-column>
-          <el-table-column class="table_td" prop="transactionsNumber" label="合同重量(吨)"></el-table-column>
-          <el-table-column class="table_td" prop="stockInQuantity" label="已入库量(吨)"></el-table-column>
-          <el-table-column class="table_td" prop="openPosition" label="可平仓量(吨)"></el-table-column>
-          <el-table-column class="table_td" prop="closedPosition" label="已平仓量(吨)">
+          <el-table-column class="table_td" prop="transactionsNumber" label="合同重量(吨)" width="100px"></el-table-column>
+          <el-table-column class="table_td" prop="stockInQuantity" label="已入库量(吨)" width="90px"></el-table-column>
+          <el-table-column class="table_td" prop="openPosition" label="可平仓量(吨)" width="90px" ></el-table-column>
+          <el-table-column class="table_td" prop="closedPosition" label="已平仓量(吨)" width="90px">
             <template slot-scope="scope">
               {{scope.row.closedPosition}}
               <i @click="closedPosition(scope.row)" class="iconfont icon-lishi"></i>
             </template>
           </el-table-column>
-          <el-table-column class="table_td" prop="cumulativeTurnover" label="已成交量(吨)">
+          <el-table-column class="table_td" prop="cumulativeTurnover" label="已成交量(吨)" width="90px">
             <template slot-scope="scope">
               {{scope.row.cumulativeTurnover}}
               <i @click="transactionRecord(scope.row)" class="iconfont icon-lishi"></i>
@@ -116,7 +131,7 @@
           <el-table-column class="table_td" label="更新时间" prop="updateDate"></el-table-column>
           <el-table-column class="table_td" label="入库结算" prop="updateDate"></el-table-column>
           <el-table-column class="table_td" label="平仓结算" prop="updateDate"></el-table-column>
-          <el-table-column prop="seller" label="操作" width="360">
+          <el-table-column prop="seller" label="操作" width="320">
             <template slot-scope="scope">
               <el-button v-if='scope.row.status=="已通过"||scope.row.status=="已成交"' class="record" @click="makeabargain(scope.row)">成交</el-button>
               <!-- 补充定金 -->
@@ -604,12 +619,12 @@ dialogImageUrl:"",
         closePositionList:[],
       },
       transactionRecordList:[],
-      // taskTypeList:[
-      //   {value:'待审核',type:1},
-      //   {value:'已完成',type:2},
-      //   {value:'已通过',type:3},
-      //   {value:'已成交',type:4},
-      // ],
+      taskTypeList:[
+        {value:'待审核',type:1},
+        {value:'执行中',type:2},
+        {value:'已完成',type:3},
+        {value:'全部订单',type:''},
+      ],
 
       // 提交类型
       submitType: true,
@@ -1412,9 +1427,31 @@ hr {
 .customer .el-form-item{
 border-bottom:1px solid #ccc;
 }
-// .danjia{
-//   width: 9px;
-//   height: 9px;
-//   margin-left: 40px;
-// }
+/deep/.base_header_layout .grid-content {
+    border-radius: 4px;
+    height: 54px;
+    line-height: 30px;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+    text-align: justify;
+    margin: 0 auto;
+}
+/deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+    width: 385px;
+    margin-left: 58%;
+}
+/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    margin-top: -3px;
+    margin-left: -10px;
+}
 </style>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -249,7 +249,7 @@
             >
           </div>
           <div style="text-align: right; color: #8890b1; font-size: 16px">
-            合计{{ total }}/{{ deptBudgetList.weight }}
+           共{{ total }}/{{ deptBudgetList.weight }}
           </div>
           <el-button class="add" type="primary" size="small" @click="add()">
             <img

vue.config.js

@@ -141,7 +141,7 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.116:8090/',
+        target: 'http://192.168.1.120:8090/',
         // target: 'http://192.168.1.112:8090/',
         // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',