Merge branch 'master' of http://git.zthymaoyi.com:3000/gdc/yiliangyiyun-pc

package.json

@@ -59,6 +59,7 @@
     "nprogress": "0.2.0",
     "path-to-regexp": "2.4.0",
     "pinyin": "^2.9.1",
+    "qrcodejs2": "0.0.2",
     "querystring": "^0.2.0",
     "register-service-worker": "^1.0.0",
     "sass-loader": "^7.1.0",

src/api/V2/houseSelfCollect/index.js

@@ -0,0 +1,113 @@
+/**
+ * @fileOverview 证书
+ * @author Yolo
+ */
+// 动态请求前缀
+const baseUrl = process.env.VUE_APP_API_CERTIFICATE
+
+// 证书一览列表 {companyId：}     老接口：getCrtListByCondition
+export const API_GET_CRTLISTBYCONDITION = `${baseUrl}/certificate/query/getCrtListByCondition`
+
+// 获取证书概况{companyId：}     老接口：getCrtNumByCompId
+export const API_GET_CRTNUMBYCOMPID = `${baseUrl}/certificate/query/getCrtNumByCompId`
+
+// 获取证书详情 {id：}     老接口：getCrtByPk
+export const API_GET_CRTBYPK = `${baseUrl}/certificate/query/getCrtByPk`
+
+// 删除证书     老接口：deleteCrt
+export const API_POST_DELETECRT = `${baseUrl}/certificate/api/deleteCrt`
+
+// 查询基础数据     老接口：getListByCondition
+export const API_GET_LISTBYCONDITION = `${baseUrl}/certificateParameter/query/getListByCondition`
+
+// 查询币种     老接口：parameterTenant
+export const API_GET_PARAMETERTENANT = '/parameterCompany/query/parameterTenant'
+
+// 查询换证历史     老接口：getCrtChangeHistorys
+export const API_GET_CRTCHANGEHISTORYS = `${baseUrl}/certificate/query/getCrtChangeHistorys`
+
+// 所属船舶     老接口：getUserVesselListByStatus
+export const API_GET_USERVESSELLISTBYSTATUS = '/vessel/query/getUserVesselListByStatus'
+
+// 新增证书     老接口：addCrt
+export const API_POST_ADDCRT = `${baseUrl}/certificate/api/addCrt`
+
+// 换证     老接口：changeCrt
+export const API_POST_CHANGECRT = `${baseUrl}/certificate/api/changeCrt`
+
+// 更新证书     老接口：updateCrt
+export const API_POST_UPDATECRT = `${baseUrl}/certificate/api/updateCrt`
+
+// 保存证书检验信息     老接口：saveCrtSurvey
+export const API_POST_SAVECRTSURVEY = `${baseUrl}/certificateSurvey/api/saveCrtSurvey`
+
+// 根据id查询检验信息     老接口：getSurveyByPk
+export const API_GET_SURVEYBYPK = `${baseUrl}/certificateSurvey/query/getSurveyByPk`
+
+// 获取证书检验信息列表     老接口：getCrtSurveyListByCondition
+export const API_GET_CRTSURVEYLISTBYCONDITION = `${baseUrl}/certificateSurvey/query/getCrtSurveyListByCondition`
+
+// 删除证书检验信息     老接口：deleteCrtSurvey
+export const API_POST_DELETECRTSURVEY = `${baseUrl}/certificateSurvey/api/deleteCrtSurvey`
+
+// 新增或修改基础数据     老接口：save1
+export const API_POST_SAVE = `${baseUrl}/certificateParameter/api/save`
+// 删除基础数据     老接口：deleteMsg
+export const API_POST_DELETE = `${baseUrl}/certificateParameter/api/delete`
+
+// 基础数据排序     老接口：order
+export const API_POST_ORDER = `${baseUrl}/certificateParameter/api/order`
+// 上传附件     老接口：uploadFiles
+export const API_POST_UPLOADFILES = '/appendix/api/uploadFiles'
+// 责任部门基础数据     老接口：deptListByCompId
+export const API_GET_DEPTLISTBYCOMPID = '/staff/query/deptListByCompId'
+
+// 导入文件     老接口：importCertificate
+export const API_POST_IMPORTMULTIPARTFILE = `${baseUrl}/certificate/api/importMultipartFile`
+
+// 导入文件附件     老接口：importCertificateFiles
+export const API_POST_IMPORTCERTIFICATEFILES = '/appendix/api/importCertificateFiles'
+
+// 校验当前导入的文件是否有关联数据     老接口：checkoutImportCertificateFiles
+export const API_GET_CHECKOUTIMPORTCERTIFICATEFILES = '/appendix/api/checkoutImportCertificateFiles'
+
+// 导入文件     老接口：importRepeatCertificate
+export const API_POST_IMPORTREPEATCERTIFICATE = `${baseUrl}/certificate/api/importRepeatCertificate`
+
+// 证书模板一览     老接口：getCrtTempList
+export const API_GET_CRTTEMPLIST = `${baseUrl}/certificateTempInfo/query/getCrtTempList`
+
+// 查询所有类型模板数据     老接口：getCrtTypeTempList
+export const API_GET_CRTTYPETEMPLIST = `${baseUrl}/certificateTempInfo/query/getCrtTypeTempList`
+
+//新增 证书模板     老接口：saveCrtTemp
+export const API_POST_SAVECRTTEMP = `${baseUrl}/certificateTempInfo/api/saveCrtTemp`
+
+//编辑 证书模板     老接口：editCrtTemp
+export const API_POST_EDITCRTTEMP = `${baseUrl}/certificateTempInfo/api/editCrtTemp`
+
+//删除 证书模板     老接口：removeCrtTemp
+export const API_POST_REMOVECRTTEMP = `${baseUrl}/certificateTempInfo/api/removeCrtTemp`
+
+//删除 证书模板     老接口：removeCrtTempId
+export const API_POST_REMOVECRTTEMPID = `${baseUrl}/certificateTempInfo/api/removeCrtTempId`
+
+//证书模板排序     老接口：changeOrder
+export const API_POST_CERTIFICATETEMPINFO_ORDER = `${baseUrl}/certificateTempInfo/api/order`
+
+//保存模板证书     老接口：saveCrtTypeTempList
+export const API_POST_SAVECRTTYPETEMPLIST = `${baseUrl}/certificateTempInfo/api/saveCrtTypeTempList`
+
+// 查询附件地址
+export const API_GET_CERTIFICATE_SEARCHPLACE = `${baseUrl}/certificate/api/searchPlace`
+
+//选项卡数值
+export const API_GET_CERTIFICATE_GETCRTNUMBYCONDITION = `${baseUrl}/certificate/query/getCrtNumByCondition`
+
+// 证书管理=> 一览接口以及顶部的状态
+export const API_GET_CERTIFICATE_GETCRTLISTBYCONDITIONDATA = `${baseUrl}/certificate/query/getCrtListByConditionData`
+
+
+
+// 证书模块
+export const API_GET_SP_GETCRTLIST = `${baseUrl}/certificate/query/getCrtListByCondition`

src/api/V2/transport/index.js

@@ -43,8 +43,11 @@ export const API_GET_AUTOMOBILE_NAME = "/driverViewInfo/selectDriverName"
 export const API_GET_AUTOMOBILE_ARRANGE = "/driverViewInfo/selectDriverDetail"
 //发货反馈
 export const API_POST_AUTOMOBILE_FEEDBACK = '/tranProcessInfo/api/insertTranCar'
-//更改反馈状态
+//更改发货反馈状态
 export const API_POST_AUTOMOBILE_STATE = '/tranProcessInfo/api/editFeedbackStatus'
+//更改收货反馈状态
+export const API_POST_AUTOMOBILE_STATEREC = '/tranProcessInfo/api/editReceivingStatus'
+
 //状态
 export const API_POST_AUTOMOBILE_ALSOSTATE = '/tranProcessInfo/editStatus'
 //运输价格

src/lang/zh.js

@@ -269,8 +269,8 @@
     noticeDetails: '新闻详情',
 
     // 证书模块
-    // certificate: "船舶证书",
-    // certificateManagement: "证书管理",
+    // certificate: '船舶证书',
+    // certificateManagement: '证书管理',
     certificate: '证书管理',
     certificateManagement: '船舶证书',
     certificateList: '证书管理',
@@ -575,10 +575,14 @@
     //发货反馈
     tranManagementTransporHairRespond: '发货反馈',
     tranManagementTransporFeedback: '反馈',
+    tranManagementFireFeedback:'火运装车反馈',
     tranManagementTransporFeedbackLook: '查看',
+    tranManagementFireFeedbackLook:'火运装车反馈查看',
     tranManagementReceivingFeedback: '收货反馈',
     tranManagementReceivingloading: '反馈',
+    tranManagementFireReceivingFeedback:'火运卸车反馈',
     tranManagementReceivingloadingLook: '查看',
+    tranManagementFireReceivingFeedbackLook:'火运卸车反馈查看',
 
     //平台审核
     platformaudit: '平台审核',
@@ -979,7 +983,22 @@
     dynamicReports: '动态报',
     dynamicReportsAdd: '新增动态报',
     dynamicReportsEdit: '编辑动态报',
-    dynamicReportsDetail: '动态报详情'
+    dynamicReportsDetail: '动态报详情',
+
+    // 库内自采
+    houseSelfCollect:'收购业务管理',
+    customerManagement:'客户管理',
+    acquisitionManagement:'仓库设置',
+    inspectionManagement:'质检管理',
+    paymentManagement:'付款管理',
+    weighingManagement:'检斤管理',
+    houseSelfCollectPrint:'查看',
+    acquisitionManagementAdd:'收购管理新增',
+    acquisitionManagementEdit:'收购管理编辑',
+    customerManagementEdit:'客户管理编辑',
+    customerManagementAdd:'客户管理添加',
+    settlement:'结算',
+    inspectInfo:'质检信息'
   },
   // 后台错误码
   message: {
@@ -4801,7 +4820,7 @@
     purchaseClosingCashierList:'采购平仓报表',
     salesDeliveryReportList:'销售出库报表',
     salesClosingCashierList:'销售平仓报表',
-   
+
   },
   financialManagement:{
     collectionManagementList:'收款管理',
@@ -7391,4 +7410,22 @@
     content: '很高兴您能使用赢海云管船产品，在使用的过程中，遇到任何问题都可以联系赢海产品顾问。',
     phone: '0411-66854772'
   },
+  //库内自采
+  houseSelfCollect:{
+    customerManagement:'客户管理',
+    acquisitionManagement:'仓库设置',
+    acquisitionManagementAdd:'收购管理新增',
+    acquisitionManagementEdit:'收购管理编辑',
+    inspectionManagement:'质检管理',
+    paymentManagement:'付款管理',
+    weighingManagement:'检斤管理',
+    houseSelfCollect:'收购业务管理',
+    houseSelfCollectPrint:'查看',
+    customerManagementEdit:'客户管理编辑',
+    customerManagementAdd:'客户管理添加',
+    settlement:'结算',
+    inspectInfo:'质检信息'
+
+  }
+
 }

src/model/houseSelfCollect/index.js

@@ -0,0 +1,10 @@
+import { errorCatcher, errorHandle, filter } from 'base-core-lib'
+import { appRx } from '../defalutConfig/indexRx'
+
+import {
+  API_GET_CRTNUMBYCOMPID
+} from '@/api/V2/houseSelfCollect'
+
+export const getCrtNumByCompId = appRx.get(API_GET_CRTNUMBYCOMPID, errorCatcher, errorHandle, filter)
+
+

src/model/transport/index.js

@@ -28,7 +28,8 @@ import {
     API_POST_AUTOMOBILE_STATE,
     API_POST_AUTOMOBILE_TRANPRICE,
     API_POST_DEL_HAULAGE_STAGE, 
-    API_POST_AUTOMOBILE_ALSOSTATE
+    API_POST_AUTOMOBILE_ALSOSTATE,
+    API_POST_AUTOMOBILE_STATEREC
 
 } from '@/api/V2/transport'
 // 司机列表
@@ -75,8 +76,11 @@ export const nameXiala = appRx.get(API_GET_AUTOMOBILE_NAME, errorCatcher, errorH
 export const arrange = appRx.get(API_GET_AUTOMOBILE_ARRANGE, errorCatcher, errorHandle, filter)
 //发货反馈
 export const feedback = appRx.post(API_POST_AUTOMOBILE_FEEDBACK, errorCatcher, errorHandle, filter)
-//更改反馈状态
+//更改发货反馈状态
 export const state = appRx.post(API_POST_AUTOMOBILE_STATE, errorCatcher, errorHandle, filter)
+//更改收货反馈状态
+export const stateRec = appRx.post(API_POST_AUTOMOBILE_STATEREC, errorCatcher, errorHandle, filter)
+
 //状态
 export const alsostate = appRx.post(API_POST_AUTOMOBILE_ALSOSTATE, errorCatcher, errorHandle, filter)
 //设置运输价格

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -0,0 +1,141 @@
+<!--收购管理-->
+<template>
+  <div class="content">
+    <div class="header">
+      <div>
+        <el-select v-model="value" placeholder="请选择">
+          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+        <el-checkbox v-model="checked" @change="allowEdit">允许手动编辑重量</el-checkbox>
+      </div>
+      <el-button type="primary" @click="newAcquisition()">新增</el-button>
+    </div>
+    <el-dialog title="新增" :visible.sync="newAcquisitionDialogVisible" width="50%">
+     <acquisitionManagementAdd></acquisitionManagementAdd>
+    </el-dialog>
+    <div class="table-content">
+      <el-table :data="tableData" style="width: 100%">
+        <el-table-column type="index" label="序号">
+          <template scope="scope">
+            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+            <span v-else>{{ scope.$index + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库名称"></el-table-column>
+        <el-table-column prop="contractNo" label="货名"></el-table-column>
+        <el-table-column label="水分范围(%)"></el-table-column>
+        <el-table-column label="基准水分(%)"></el-table-column>
+        <el-table-column label="扣重比"></el-table-column>
+        <el-table-column label="销量上线"></el-table-column>
+        <el-table-column label="状态"></el-table-column>
+        <el-table-column label="扣重比"></el-table-column>
+        <el-table-column label="通过时间"></el-table-column>
+        <el-table-column label="操作" width="300">
+          <template slot-scope="scope">
+            <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">查看</el-button>
+            <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">打印</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-popover
+        placement="center"
+        width="160"
+        v-model="visible">
+        <p>这是一段内容这是一段内容确定删除吗？</p>
+        <div style="text-align: right; margin: 0">
+          <el-button size="mini" type="text" @click="visible = false">取消</el-button>
+          <el-button type="primary" size="mini" @click="visible = false">确定</el-button>
+        </div>
+      </el-popover>
+    </div>
+  </div>
+</template>
+<script>
+  // import { getList,} from '@/model/houseSelfCollect/index'
+  import acquisitionManagementAdd from './acquisitionManagementAdd.vue'
+  export default {
+
+    components: {
+
+    },
+    watch: {
+
+    },
+    data() {
+      return {
+        newAcquisitionDialogVisible:false,
+         visible: false,
+        checked: false,
+        tableData: [{
+          date: '2016-05-02',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1518 弄'
+        }, {
+          date: '2016-05-04',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1517 弄'
+        }, {
+          date: '2016-05-01',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1519 弄'
+        }, {
+          date: '2016-05-03',
+          name: '王小虎',
+          address: '上海市普陀区金沙江路 1516 弄'
+        }],
+        options: [{
+          value: '选项1',
+          label: '黄金糕'
+        }, {
+          value: '选项2',
+          label: '双皮奶'
+        }, {
+          value: '选项3',
+          label: '蚵仔煎'
+        }, {
+          value: '选项4',
+          label: '龙须面'
+        }, {
+          value: '选项5',
+          label: '北京烤鸭'
+        }],
+        value: ''
+      }
+    },
+    activated() {
+
+    },
+    created() {
+      this.value = this.options[0].value
+    },
+    methods: {
+      newAcquisition(){
+        this.$router.push({
+          name: 'acquisitionManagementAdd'
+          // query: { id: row.id },
+        })
+
+      },
+      allowEdit(val) {
+        console.log(val)
+      },
+      handleEdit(index, row) {
+        console.log(index, row);
+      },
+      handleDelete(index, row) {
+        this.visible = true
+        console.log(index, row);
+      }
+    },
+  }
+</script>
+<style lang="scss" scoped>
+  .header{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+</style>

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -0,0 +1,495 @@
+<!--收购管理新增-->
+<template>
+  <el-container class="container">
+    <el-header class="header">
+      <img class="head-icon" src="../../../public/img/icons/acquisition6.png" alt="">
+      <div class="head-title">鲅鱼圈一号库</div>
+    </el-header>
+    <el-main>
+      <el-form ref="form" label-position="left" :model="form" label-width="120px">
+        <el-row class="base-info">
+          基本信息
+        </el-row>
+        <div class="row1">
+          <div class="grid-content">
+            <el-form-item label="货名">
+              <el-input v-model="form.name"></el-input>
+            </el-form-item>
+          </div>
+          <div class="grid-content">
+            <el-form-item label="基准水分(%)">
+              <el-input v-model="form.name"></el-input>
+            </el-form-item>
+          </div>
+          <div class="grid-content">
+            <el-form-item label="扣重比">
+              <el-input v-model="form.name"></el-input>
+            </el-form-item>
+          </div>
+        </div>
+        <div class="row2">
+          <div class="grid-content">
+            <el-form-item label="干粮水分">
+              <el-input v-model="form.name"></el-input>
+            </el-form-item>
+          </div>
+          <div class="grid-content">
+            <el-form-item label="水分上限">
+              <el-input v-model="form.name"></el-input>
+            </el-form-item>
+          </div>
+          <div class="grid-content">
+            <el-form-item label="销售上限(年/吨)">
+              <el-input v-model="form.name"></el-input>
+            </el-form-item>
+          </div>
+        </div>
+      </el-form>
+      <el-row class="row3">
+        <div class="top">
+          <div class="title">粮价设置</div>
+          <el-button class="btn" @click="newSetPrice">新增</el-button>
+        </div>
+        <div class="content" v-for="(item,index) in priceList" :key="index">
+          <div class="top">
+            <div class="left">
+              <div class="text">基准单价（元/公斤）</div>
+              <el-input v-model="priceList.name"></el-input>
+            </div>
+            <el-button @click="delSetPrice(item,index)">删除</el-button>
+          </div>
+          <div class="level">
+            <el-checkbox-group v-model="checkList" @change="changeLevel">
+              <el-checkbox label="一等"></el-checkbox>
+              <el-checkbox label="二等"></el-checkbox>
+              <el-checkbox label="三等"></el-checkbox>
+              <el-checkbox label="等外"></el-checkbox>
+            </el-checkbox-group>
+          </div>
+          <div class="count">
+            <div class="left">
+              <div>水分（%）</div>
+              <div>降幅（元/0.5%）</div>
+            </div>
+            <div class="right">
+              <div class="line"></div>
+              <div class="jt-style"></div>
+
+              <div v-for="(item1,index) in item.detailList">
+                <div class="item-style">
+                  <div v-if="item1.type!=4" class="item-style-title">
+                    <span>{{item1.name}}{{item1.index}}</span>
+                    <span class="add" @click="add(item,item1,index)" v-if="item1.type!=3">+</span>
+                    <span class="reduce" @click="reduce(item,item1,index)"
+                      v-show="item1.type!=1&&item1.type!=2&&item1.type!=3">-</span>
+                  </div>
+                  <div v-show="item1.type!=4">
+                    <input class="water-price" v-model="form.name" :disabled="item1.isWrite?false:true"></input>
+                  </div>
+                  <div class="circle" v-if="item1.type!=4"></div>
+                </div>
+                <div class="bottom-price">
+                  <input v-if="item1.type==4" class="water-price" v-model="item1.jfprice"></input>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </el-row>
+
+    </el-main>
+  </el-container>
+</template>
+<script>
+  // import { getList,} from '@/model/houseSelfCollect/index'
+
+  export default {
+
+    components: {
+
+    },
+    watch: {
+
+    },
+    data() {
+      return {
+        priceList: [{
+          unitPrice: '',
+          index: 0,
+          detailList: [{
+              type: 1,
+              name: "干粮",
+              water: '15',
+              isWrite: false
+            },
+            {
+              type: 4,
+              jfprice: "0.03"
+            },
+            {
+              type: 2,
+              name: "基准",
+              water: '30',
+              isWrite: false
+            },
+            {
+              type: 4,
+              jfprice: "0.03"
+            },
+            {
+              type: 3,
+              name: "上限",
+              water: '40',
+              isWrite: false
+            },
+          ],
+        }],
+        checkList: [],
+        form: {
+          name: "姓名"
+        },
+
+        index: 0
+      }
+    },
+    created() {},
+    methods: {
+      add(item, item1, index) {
+        debugger
+        // let _data = this.detailList;
+        if (item.index > 2) {
+          this.$message({
+            message: '最多插入3个分界值',
+            type: 'warning'
+          });
+        } else {
+          item.index++
+          item.detailList.splice(index + 1, 0, {
+            name: "分界",
+            water: '30',
+            type: 5,
+            index: 1,
+            isWrite: true
+            // jfprice: "0.03"
+          });
+          item.detailList.splice(index + 1, 0, {
+            jfprice: "0.03",
+            type: 4
+          });
+          this.makeSpliceIndex(item, item1, index)
+        }
+      },
+      reduce(item, item1, index) {
+        item.index--
+        item.detailList.splice(index, 2);
+        console.log(item, index)
+      },
+      makeSpliceIndex(item, item1) {
+        let _index = 0
+        for (let j = 0; j < item.detailList.length; j++) {
+          if (item.detailList[j].type == 5) {
+            _index++
+            item.detailList[j].index = _index;
+          }
+        }
+      },
+      changeLevel() {
+        console.log(this.checkList)
+      },
+      newSetPrice() {
+        let _newObj = {
+          unitPrice: '',
+          index: 0,
+          detailList: [{
+              type: 1,
+              name: "干粮",
+              water: '15',
+              isWrite: false
+            },
+            {
+              type: 4,
+              jfprice: "0.03"
+            },
+            {
+              type: 2,
+              name: "基准",
+              water: '30',
+              isWrite: false
+            },
+            {
+              type: 4,
+              jfprice: "0.03"
+            },
+            {
+              type: 3,
+              name: "上限",
+              water: '40',
+              isWrite: false
+            },
+          ],
+        }
+        this.priceList.push(_newObj)
+      },
+      delSetPrice() {
+        let _newObj = {
+          unitPrice: '',
+          detailList: [{
+              type: 1,
+              name: "干粮",
+              water: '15',
+              isWrite: false
+            },
+            {
+              type: 4,
+              jfprice: "0.03"
+            },
+            {
+              type: 2,
+              name: "基准",
+              water: '30',
+              isWrite: false
+            },
+            {
+              type: 4,
+              jfprice: "0.03"
+            },
+            {
+              type: 3,
+              name: "上限",
+              water: '40',
+              isWrite: false
+            },
+          ],
+        }
+        // this.detailList.push(_newObj)
+      }
+    },
+  }
+</script>
+<style lang="scss">
+  .el-checkbox__input.is-checked .el-checkbox__inner,
+  .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+    background-color: #5878E8;
+    border-color: #5878E8;
+  }
+
+  .el-checkbox__input.is-checked+.el-checkbox__label {
+    color: #5878E8;
+  }
+
+  .el-checkbox.is-bordered.is-checked {
+    border-color: #5878E8;
+  }
+
+  .el-checkbox__input.is-focus .el-checkbox__inner {
+    border-color: #5878E8;
+  }
+
+  .basic-container {
+    overflow: auto;
+  }
+
+  .container {
+    padding: 20px
+  }
+
+  /deep/.el-header {
+    padding: 0;
+  }
+
+  .header {
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid #E9ECF7;
+    padding-bottom: 10px;
+    width: 80%;
+
+    .head-icon {
+      width: 19px;
+      height: 19px;
+      margin-right: 10px;
+    }
+
+    .head-title {
+      font-size: 21px;
+      font-weight: 600;
+      color: #323233;
+    }
+  }
+
+  .row1,
+  .row2 {
+    // background: red;
+    display: flex;
+    // margin-right: 20px;
+  }
+
+  .row3 {
+    .top {
+      display: flex;
+
+      .btn {
+        width: 52px;
+        height: 24px;
+        background: #5878E8;
+        color: white;
+        margin-left: 20px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        // text-align: center;
+      }
+    }
+
+    .title {
+      display: flex;
+      align-items: center;
+      border-left: 4px solid #5473E8;
+      font-size: 16px;
+      font-weight: 600;
+      color: #323233;
+      padding-left: 10px;
+    }
+  }
+
+  .base-info {
+    border-left: 4px solid #5473E8;
+    font-size: 16px;
+    font-weight: 600;
+    color: #323233;
+    padding-left: 10px;
+    margin: 24px 0 10px 0;
+  }
+
+  .grid-content {
+    margin-right: 20px;
+  }
+
+  .content {
+    border: 1px solid #D8DCE6;
+    margin: 20px 0;
+    padding: 15px;
+    border-radius: 4px;
+
+    .top {
+      display: flex;
+      justify-content: space-between;
+
+      .left {
+        display: flex;
+        align-items: center;
+
+        .text {
+          width: 220px;
+          font-size: 14px;
+          font-weight: 400;
+          color: #8890B1;
+        }
+      }
+    }
+
+    .level {
+      margin: 10px 0;
+    }
+
+    .count {
+      display: flex;
+      margin-bottom: 15px;
+
+      .left {
+        width: 10%;
+        display: flex;
+        flex-direction: column;
+        align-items: flex-end;
+        justify-content: flex-end;
+        line-height: 24px;
+      }
+
+      .right {
+        width: 85%;
+        position: relative;
+        padding-bottom: 50px;
+
+        .water-price {
+          width: 60px;
+          height: 30px;
+          background: #F6F7FB;
+          border-radius: 4px;
+          border: 1px solid #D8DCE6;
+          text-align: center
+        }
+
+        .add,
+        .reduce {
+          width: 16px;
+          height: 16px;
+          background: #5473E8;
+          border-radius: 2px;
+          color: white;
+          display: inline-block;
+          text-align: center;
+          line-height: 16px;
+        }
+
+        .reduce {
+          background: white;
+          color: #D5D8DE;
+          border: 1px solid #D5D8DE;
+          display: inline-flex;
+          justify-content: center;
+          align-items: center;
+        }
+
+        .item-style {
+          position: relative;
+
+          .item-style-title {
+            margin-bottom: 10px;
+            text-align: center;
+          }
+        }
+
+        .line {
+          position: absolute;
+          top: 72px;
+          width: 100%;
+          height: 5px;
+          background: linear-gradient(39deg, #E6EEFF 0%, #91B0F5 42%, #5878E8 100%);
+          border-radius: 3px;
+        }
+
+        .bottom-price {
+          position: absolute;
+          bottom: -10px;
+        }
+
+        .jt-style {
+          position: absolute;
+          top: 64px;
+          width: 0px;
+          height: 0px;
+          right: -15px;
+          border-left: 15px solid #5473E8;
+          border-top: 10px solid transparent;
+          border-bottom: 10px solid transparent;
+        }
+
+        display: flex;
+        justify-content: space-between;
+
+        .circle {
+          position: absolute;
+          z-index: 2;
+          width: 15px;
+          height: 15px;
+          background: #FFFFFF;
+          border: 3px solid #5473E8;
+          border-radius: 50%;
+          right: 40%;
+          bottom: -22px
+        }
+
+      }
+    }
+  }
+</style>

src/views/houseSelfCollect/component/routers/route.js

@@ -0,0 +1,177 @@
+import Layout from '@/layout/index';
+
+const houseSelfCollectRouter = {
+  path: '/houseSelfCollect',
+  component: Layout,
+  redirect: '/houseSelfCollect',
+  name: 'houseSelfCollect',
+  alwaysShow: true, // will always show the root menu
+  meta: {
+    title: 'houseSelfCollect',
+    module: 'contractManagement',
+    icon: '-hetongguanli'
+  },
+  children: [
+    // 客户管理
+    {
+      path: 'customerManagement',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagement'),
+      name: 'customerManagement',
+      meta: {
+        title: 'customerManagement',
+        shortcutEntrance: 'houseSelfCollect',
+        module: 'procurement.procurementOrder.delete',
+        permissicon: [],
+        keepAlive: true
+      }
+    },
+    //客户管理编辑
+    {
+      path: 'customerManagementEdit',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagementEdit'),
+      name: 'customerManagementEdit',
+      meta: {
+        title: 'customerManagementEdit',
+        shortcutEntrance: 'houseSelfCollect',
+        module: 'procurement.procurementOrder.delete',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+        //客户管理添加
+        {
+          path: 'customerManagementAdd',
+          component: () =>
+            import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/customerManagementAdd'),
+          name: 'customerManagementAdd',
+          meta: {
+            title: 'customerManagementAdd',
+            shortcutEntrance: 'houseSelfCollect',
+            module: 'procurement.procurementOrder.delete',
+            permissicon: [],
+            keepAlive: true
+          },
+          hidden: true
+        },
+    //收购管理
+    {
+      path: 'acquisitionManagement',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/acquisitionManagement'),
+      name: 'acquisitionManagement',
+      meta: {
+        title: 'acquisitionManagement',
+        shortcutEntrance: 'houseSelfCollect',
+        module: 'procurement.procurementOrder.delete',
+        permissicon: [],
+        keepAlive: true
+      }
+    },
+    //收购新增
+    {
+      path: 'acquisitionManagementAdd',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/acquisitionManagementAdd'),
+      name: 'acquisitionManagementAdd',
+      meta: {
+        title: 'acquisitionManagementAdd',
+        shortcutEntrance: 'houseSelfCollect',
+        module: 'procurement.procurementOrder.delete',
+        permissicon: [],
+        keepAlive: true
+      },
+        hidden: true
+    },
+    // 质检管理
+    {
+      path: 'inspectionManagement',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectionManagement'),
+      name: 'inspectionManagement',
+      meta: {
+        title: 'inspectionManagement',
+        shortcutEntrance: 'houseSelfCollect',
+        module: 'procurement.procurementOrder.delete',
+        permissicon: [],
+        keepAlive: true
+      }
+    },
+    // 检斤管理
+    {
+      path: 'weighingManagement',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weighingManagement'),
+      name: 'weighingManagement',
+      meta: {
+        title: 'weighingManagement',
+        shortcutEntrance: 'houseSelfCollect',
+        module: 'procurement.procurementOrder.delete',
+        permissicon: [],
+        keepAlive: true
+      }
+    },
+    // 付款管理
+    {
+      path: 'paymentManagement',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/paymentManagement'),
+      name: 'paymentManagement',
+      meta: {
+        title: 'paymentManagement',
+        shortcutEntrance: 'houseSelfCollect',
+        module: 'procurement.procurementOrder.delete',
+        permissicon: [],
+        keepAlive: true
+      }
+    },
+    //打印
+    {
+      path: 'houseSelfCollectPrint',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/houseSelfCollectPrint'),
+      name: 'houseSelfCollectPrint',
+      meta: {
+        title: 'houseSelfCollectPrint',
+        shortcutEntrance: 'houseSelfCollectPrint',
+        module: 'procurement.procurementOrder.delete',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+    {
+      path: 'settlement',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/settlement'),
+      name: 'settlement',
+      meta: {
+        title: 'settlement',
+        shortcutEntrance: 'settlement',
+        module: 'procurement.procurementOrder.delete',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+    {
+      path: 'inspectInfo',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/inspectInfo'),
+      name: 'inspectInfo',
+      meta: {
+        title: 'inspectInfo',
+        shortcutEntrance: 'inspectInfo',
+        module: 'procurement.procurementOrder.delete',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
+  ],
+
+};
+
+export default houseSelfCollectRouter;

src/views/houseSelfCollect/customerManagement.vue

@@ -0,0 +1,303 @@
+<!--客户管理-->
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="12">
+      <template slot="left">
+        <ws-button type="primary" @click="getCustomer()">获取客户</ws-button>
+        <ws-button type="primary" @click="createCustomer()"
+          >创建新客户</ws-button
+        >
+      </template>
+      <template slot="right">
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          @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>
+        <div></div>
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按姓名、手机号查找"
+          clearable
+          maxlength="500"
+          type="input"
+        ></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>
+      </template>
+    </BaseHeaderLayout>
+    <div class="seach">
+      <!-- <div class="search-left">
+        <ws-input 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>
+      </div> -->
+      <div class="search-right">
+        <!-- <ws-button @click="getCustomer()">获取客户</ws-button> -->
+        <el-dialog
+          title="客户扫码"
+          :visible.sync="customerDialogVisible"
+          width="30%"
+        >
+          <div id="qrcode"></div>
+        </el-dialog>
+        <!-- <ws-button @click="createCustomer()">创建新客户</ws-button> -->
+        <el-dialog
+          title="创建新客户"
+          :visible.sync="creatNewCustomerDialogVisible"
+          width="50%"
+        >
+          <customerManagementAdd></customerManagementAdd>
+        </el-dialog>
+      </div>
+    </div>
+
+    <el-table
+      :data="customertList.records"
+      style="width: 100%; margin-top: 20px"
+      ref="warehouseList"
+      border
+      height="780"
+    >
+      <el-table-column type="index" label="序号">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="contractNo" label="客户"></el-table-column>
+      <el-table-column prop="goodsName" label="手机号"></el-table-column>
+      <el-table-column prop="weight" label="银行卡号"></el-table-column>
+      <el-table-column
+        prop="unitContractPrice"
+        label="开户行"
+      ></el-table-column>
+      <el-table-column prop="packingMethod" label="收款人"></el-table-column>
+      <el-table-column prop="status" label="状态"></el-table-column>
+      <el-table-column prop="address" label="操作">
+        <template slot-scope="scope">
+          <img
+            width="16"
+            height="16"
+            style="vertical-align: text-top; margin: 0 6px"
+            src="../../../public/img/chakan.png"
+            @click="handleExamine(scope.row)"
+            v-hasPermission="
+              `contractManagement.buyContract.buyContractInfo.view`
+            "
+            alt
+          />
+          <img
+            width="17"
+            height="16"
+            style="vertical-align: text-top; margin: 0 6px"
+            src="../../../public/img/bianji.png"
+            @click="handleEdit(scope.row)"
+            v-hasPermission="
+              `contractManagement.buyContract.buyContractInfo.edit`
+            "
+            alt
+          />
+          <img
+            width="16"
+            height="17"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: -1px;
+              margin: 0 6px;
+            "
+            src="../../../public/img/shanchu.png"
+            v-hasPermission="
+              `contractManagement.buyContract.buyContractInfo.delete`
+            "
+            @click="handleDelete(scope.row)"
+            alt
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+    <div style="text-align: center">
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+// import xx
+// '@/model/houseSelfCollect/index'
+import QRCode from 'qrcodejs2'
+import customerManagementAdd from './customerManagementAdd.vue'
+export default {
+  components: {
+    customerManagementAdd,
+  },
+  watch: {},
+  data() {
+    return {
+      searchKeyWord: '',
+      customerDialogVisible: false,
+      creatNewCustomerDialogVisible: false,
+      customertList: {
+        records: [
+          {
+            contractNo: '小王',
+            goodsName: '17127741111',
+            weight: '111111111',
+            unitContractPrice: '312321312132321',
+            packingMethod: '12213321231fsfssfd',
+            status: 'fsdfsdfsd',
+          },
+        ],
+      },
+      currentPage: 1,
+      pageSize: 10,
+      deptBudgetTotal: 0,
+      deptCircularPage: {},
+      taskTypeList: [], //选择仓库数组
+      searchTypeText: '', //仓库
+      searchType: '',
+    }
+  },
+  methods: {
+    find() {
+      console.log('搜索')
+    },
+    //获取客户
+    getCustomer() {
+      this.customerDialogVisible = true
+      this.$nextTick(function () {
+        document.getElementById('qrcode').innerHTML = ''
+        let qrcode = new QRCode('qrcode', {
+          width: 150,
+          height: 150,
+          text: 'https://www.baidu.com',
+          colorDark: '#109dff',
+          colorLight: '#d9d9d9',
+          
+        })
+      })
+    },
+    //选择仓库改变事件
+    selecttaskType() {},
+    //创建客户
+    createCustomer() {
+      // this.creatNewCustomerDialogVisible = true
+      this.$router.push({
+        name: 'customerManagementAdd',
+        // query: { id: row.id },
+      })
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+    handleExamine(row) {
+      console.log(row)
+      // this.$router.push({
+      //   name: 'purchaseContractExamine',
+      //   query: { id: row.id, status: row.status },
+      // })
+    },
+    handleEdit(row) {
+      console.log(row)
+      this.$router.push({
+        name: 'customerManagementEdit',
+        query: {
+          id: row.id,
+        },
+      })
+    },
+    handleDelete(row) {
+      this.$confirm('确定删除该客户？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+    },
+    getList() {},
+  },
+}
+</script>
+<style lang="scss" scoped>
+.seach {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  .find {
+    width: 32px;
+  }
+
+  .search-left {
+    display: flex;
+  }
+}
+.ws-info-table {
+  border: none;
+}
+.ws-info-table .el-form-item {
+  width: 50%;
+  border: none;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 30%;
+  text-align: center;
+  background: #ffffff;
+  color: #8890b1;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
+/deep/.el-table--enable-row-transition .el-table__body td {
+  text-align: center;
+}
+</style>

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -0,0 +1,171 @@
+<!--客户管理-->
+<template>
+  <div class="content">
+     <!-- <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left titleup">{{ information }}质检信息</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button class="bg-bottom" type="primary" size="small" @click="cancel"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row> -->
+    <div class="title">新增粮商</div>
+    <div class="unload">
+      <el-upload action="https://jsonplaceholder.typicode.com/posts/" :limit="2" list-type="picture-card"
+        :on-preview="handlePictureCardPreview" :on-remove="handleRemove">
+        <i class="el-icon-plus"></i>
+      </el-upload>
+      <el-form ref="form" :model="form" label-width="120px">
+        <el-form-item label="姓名">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="身份证号">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="银行卡号">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="开户行">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="开户支行">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="收款人姓名">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="收款人身份证号">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+        <!-- 验证码 -->
+        <el-form-item prop="veriCode" :label="$t('login.register08')">
+            <el-input v-model="form.name"></el-input>
+   <!--       <div style="display: flex; justify-content: space-between">
+            <el-input
+              v-model="form.name"
+              :disabled="disabledFlag"
+              class="code_style"
+              :placeholder="$t('login.registerVerif08')"
+            />
+            <div>
+              <ws-button
+                v-show="verification"
+                type="primary"
+                @click="toSend"
+                >{{ $t('login.sendVerification') }}</ws-button
+              >
+              <ws-button v-show="!verification" class="retry" disabled
+                >{{ $t('login.retry') }}({{ count }})s</ws-button
+              >
+            </div>
+          </div> -->
+        </el-form-item>
+        <el-form-item label="联系地址">
+          <el-input v-model="form.name"></el-input>
+        </el-form-item>
+       </el-form>
+    </div>
+  </div>
+</template>
+<script>
+  // import xx
+  // '@/model/houseSelfCollect/index'
+
+  export default {
+    components: {},
+    watch: {},
+    data() {
+      return {
+        dialogImageUrl: '',
+        dialogVisible: false,
+        form:{
+          name:'姓名'
+        },
+        disabledFlag: true,
+
+      }
+    },
+    methods: {
+      handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
+      handlePictureCardPreview(file) {
+        this.dialogImageUrl = file.url;
+        this.dialogVisible = true;
+      },
+      // 发送验证码
+      toSend() {
+        if (this.registerForm.linkmanPhone) {
+          if (validUserCellPhone(this.registerForm.linkmanPhone)) {
+            this.disabledFlag = false
+            clearInterval(this.timer)
+            this.timer = null
+            const TIME_COUNT = 60
+            if (!this.timer) {
+              this.count = TIME_COUNT
+              this.verification = false
+              let data = {
+                mobilePhone: this.registerForm.linkmanPhone,
+              }
+              sendRegisterCode(data)
+                .toPromise()
+                .then((res) => {
+                  this.timer = setInterval(() => {
+                    if (this.count > 0 && this.count <= TIME_COUNT) {
+                      this.count--
+                    } else {
+                      this.verification = true
+                      clearInterval(this.timer)
+                      this.timer = null
+                    }
+                  }, 1000)
+                })
+                .catch((err) => {
+                  this.verification = true
+                })
+            }
+          } else {
+            EventBus.$emit('error', this.$t('login.registerVerif09'))
+          }
+        } else {
+          EventBus.$emit('error', this.$t('login.registerVerif05'))
+        }
+      },
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  /deep/.el-form-item{
+    margin-bottom: 0;
+  }
+  .content {
+    padding: 20px;
+  }
+
+  .seach {
+    display: flex;
+    align-items: center;
+
+    .find {
+      width: 32px;
+    }
+
+    .search-left {
+      display: flex;
+    }
+  }
+  .titleup {
+  position: relative;
+}
+</style>

src/views/houseSelfCollect/customerManagementEdit.vue

@@ -0,0 +1,115 @@
+<!--客户管理-->
+<template>
+  <div class="content">
+    客户管理编辑
+  </div>
+</template>
+<script>
+// import xx
+// '@/model/houseSelfCollect/index'
+
+export default {
+  components: {},
+  watch: {},
+  data() {
+    return {
+      searchKeyWord: '',
+      customertList:{
+        records:[
+          {
+            contractNo:"小王",
+            goodsName:"17127741111",
+            weight:"111111111",
+            unitContractPrice:'312321312132321',
+            packingMethod:"12213321231fsfssfd",
+            status:"fsdfsdfsd"
+            
+          }
+        ]
+      },
+       currentPage: 1,
+      pageSize: 10,
+      deptBudgetTotal: 0,
+      deptCircularPage: {},
+    }
+  },
+  methods: {
+    find() {
+      console.log('搜索')
+    },
+    getCustomer() {},
+    createCustomer() {},
+        handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+        handleExamine(row) {
+      console.log(row)
+      // this.$router.push({
+      //   name: 'purchaseContractExamine',
+      //   query: { id: row.id, status: row.status },
+      // })
+    },
+        handleEdit(row) {
+          console.log(row)
+      this.$router.push({
+        name: 'purchaseContractEdit',
+        query: { id: row.id },
+      })
+    },
+        handleDelete(row) {
+          console.log(row)
+      // var text = ''
+      // if (row.deliverType == 1) {
+      //   text =
+      //     '删除该合同将同时永久删除合同对应的临时仓库相关数据，是否确定删除？'
+      // } else {
+      //   text = '合同删除后不可恢复，是否继续删除？'
+      // }
+      // this.$confirm(text, '提示', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
+      //   type: 'warning',
+      // })
+      //   .then(() => {
+      //     deletecontract({ id: row.id })
+      //       .toPromise()
+      //       .then((response) => {
+      //         this.$notify.success({
+      //           title: '成功',
+      //           message: '删除成功',
+      //         })
+      //         this.getList()
+      //       })
+      //       .catch((response) => {})
+      //   })
+      //   .catch(() => {
+      //     return false
+      //   })
+    },
+    getList(){}
+  }
+}
+</script>
+<style lang="scss" scoped>
+.content{
+  padding: 20px;
+}
+.seach {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  .find {
+    width: 32px;
+  }
+  .search-left {
+    display: flex;
+  }
+}
+</style>

src/views/houseSelfCollect/houseSelfCollectPrint.vue

@@ -0,0 +1,50 @@
+<!--打印-->
+<template>
+  <div id="print" class="center">
+   <div class="title">中天昊元粮食贸易有限公司结算凭证</div>
+   
+  </div>
+</template>
+<script>
+import {
+  // getList,
+} from '@/model/houseSelfCollect/index'
+
+export default {
+
+  components: {
+
+  },
+  watch: {
+
+  },
+  data() {
+    return {
+      tableData:{},
+ 
+    }
+  },
+  activated() {
+
+  },
+  methods: {
+
+  },
+}
+</script>
+<style lang="scss" scoped>
+.center{
+  width: 90%;
+  border: 1px solid #D8DCE6;
+  margin: 10px auto;
+}
+.title{
+    width: 325px;
+    font-size: 20px;
+    margin: 10px auto;
+    text-align: center;
+    color: #323233;
+    font-weight: 600;
+    border-bottom-style: double ;
+}
+</style>

src/views/houseSelfCollect/inspectInfo.vue

@@ -0,0 +1,318 @@
+<!--质检信息-->
+<template>
+  <div class="center">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left titleup">{{ information }}质检信息</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button class="bg-bottom" type="primary" size="small" @click="cancel"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+    <div class="substance">
+      <ws-form>
+        <div style="width: 50%; margin: 0 auto">
+          <div class="title">基本信息</div>
+          <ws-info-table>
+            <ws-form-item label="编号" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入编号"
+                maxlength="100"
+                disabled
+                size="small"
+              />
+            </ws-form-item>
+            <ws-form-item label="仓位号" span="1" prop="waterContent">
+              <ws-select
+                v-model="warehouseList.a"
+                placeholder="请输入仓位号"
+                class="typeselect"
+                @change="selectpackingMethod"
+                :disabled="disabled"
+              >
+                <ws-option
+                  v-for="item in goodnameList"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
+                />
+              </ws-select>
+            </ws-form-item>
+            <ws-form-item label="客户" span="1" prop="waterContent">
+              <ws-select
+                v-model="warehouseList.a"
+                placeholder="请输入货名"
+                class="typeselect"
+                @change="selectpackingMethod"
+                :disabled="disabled"
+              >
+                <ws-option
+                  v-for="item in goodnameList"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
+                />
+              </ws-select>
+            </ws-form-item>
+            <ws-form-item label="囤位号" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入客户"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="车牌号" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入客户"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="货名" span="1" prop="waterContent">
+              <ws-select
+                v-model="warehouseList.a"
+                placeholder="请输入货名"
+                class="typeselect"
+                @change="selectpackingMethod"
+                :disabled="disabled"
+              >
+                <ws-option
+                  v-for="item in goodnameList"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
+                />
+              </ws-select>
+            </ws-form-item>
+            <ws-form-item label="扣重比" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入扣重比"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+          </ws-info-table>
+
+          <div class="title">质检数据</div>
+          <ws-info-table>
+            <ws-form-item label="等级" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入编号"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="杂质（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入杂质占比"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="水分（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入水分占比"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="霉变粒（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入霉变粒占比"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="容重（克/升）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入容重"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="热损伤（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入热损伤占比"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="不完整粒（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入不完整粒占比"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            
+          </ws-info-table>
+          <div style="text-align:right;color:#323233;">潮粮单价（元/公斤）：000000000</div>
+          <div class="but">
+            <el-button @click="cancel" v-if="this.types != 2" type="primary"
+              >取消</el-button
+            >
+            <el-button @click="print" v-if="this.types != 2" type="primary"
+              >保存并打印</el-button
+            >
+            <el-button @click="cancel" v-if="this.types == 2" type="primary"
+              >关闭</el-button
+            >
+          </div>
+        </div>
+      </ws-form>
+    </div>
+    <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint>
+  </div>
+</template>
+<script>
+import {} from '@/model/houseSelfCollect/index'
+import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
+export default {
+  components: {
+    houseSelfCollectPrint,
+  },
+  watch: {},
+  data() {
+    return {
+      warehouseList: {},
+      disabled: false,
+      types: '',
+      information: '添加',
+    }
+  },
+  activated() {
+    this.types = this.$route.query.type
+    if (this.types == 2) {
+      this.disabled = true
+      this.information = '查看'
+    } else if (this.types == 3) {
+      this.disabled = false
+      this.information = '编辑'
+    }
+    console.log(this.information)
+  },
+  methods: {
+    print() {
+      this.$confirm('确定保存质检信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          // this.xx = true;
+          let newstr = document.getElementById('print').innerHTML
+          let oldstr = document.body.innerHTML
+          document.body.innerHTML = newstr
+          window.print()
+          document.body.innerHTML = oldstr
+          // window.location.reload()
+          this.$router.push({ path: 'paymentManagement' })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    cancel() {
+      this.$router.push({ path: 'inspectionManagement' })
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.center {
+  background: #f6f7fc;
+}
+
+.ws-info-table {
+  border: none;
+}
+.ws-info-table .el-form-item {
+  width: 50%;
+  border: none;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 30%;
+  text-align: center;
+  background: #ffffff;
+  font-size: 14px;
+  color: #8890b1;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+.title {
+  font-size: 16px;
+  font-weight: 600;
+  margin: 10px;
+}
+.titleup {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 15px;
+  background: #8890b1;
+  margin-right: 5px;
+}
+
+.substance {
+  background: #ffffff;
+  width: 100%;
+  border-radius: 4px;
+  margin: 0 auto;
+  padding-top: 20px;
+}
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
+/deep/.el-table--enable-row-transition .el-table__body td {
+  text-align: center;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 15px 0px;
+}
+.titleup {
+  position: relative;
+}
+.titleup::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.but {
+  text-align: center;
+  margin: 20px auto;
+}
+</style>

src/views/houseSelfCollect/inspectionManagement.vue

@@ -0,0 +1,201 @@
+<!--质检管理-->
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="12">
+      <template slot="left">
+        <ws-button type="primary" @click="inspectInfo(1)">添加</ws-button>
+      </template>
+      <template slot="right">
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          @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>
+        <div></div>
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按编号、客户名、车牌号查找"
+          clearable
+          maxlength="500"
+          type="input"
+        ></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>
+      </template>
+    </BaseHeaderLayout>
+    <el-table
+      :data="warehouseList"
+      style="width: 100%; margin-top: 20px"
+      ref="warehouseList"
+      border
+      height="780"
+    >
+      <el-table-column type="index" label="序号" width="50">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="contractNo"
+        width="120"
+        label="编号"
+      ></el-table-column>
+      <el-table-column prop="contractNo" label="客户"></el-table-column>
+      <el-table-column prop="contractNo" label="车牌号"></el-table-column>
+      <el-table-column prop="contractNo" label="货名"></el-table-column>
+      <el-table-column prop="contractNo" label="水分（%）"></el-table-column>
+      <el-table-column
+        prop="contractNo"
+        label="净重单价（元/公斤）"
+      ></el-table-column>
+      <el-table-column prop="contractNo" label="仓位号"></el-table-column>
+      <el-table-column prop="contractNo" label="囤位号"></el-table-column>
+      <el-table-column prop="contractNo" label="质检员"></el-table-column>
+      <el-table-column prop="contractNo" label="质检时间"></el-table-column>
+      <el-table-column prop="contractNo" label="状态"></el-table-column>
+      <el-table-column width="300" prop="contractNo1" label="操作">
+        <el-button @click="inspectInfo(2)">查看</el-button>
+        <el-button @click="inspectInfo(3)">编辑</el-button>
+        <el-button @click="del">删除</el-button>
+      </el-table-column>
+    </el-table>
+    <div style="text-align:center">
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="deptBudgetTotal"
+    >
+    </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+import{
+
+} from '@/model/houseSelfCollect/index'
+
+export default {
+  components: {},
+  watch: {},
+  data() {
+    return {
+       //分页
+      currentPage: 1,
+      pageSize: 10,
+      deptCircularPage:{},
+      deptBudgetTotal: 0,
+
+      searchKeyWord: '',
+      taskTypeList: [],
+      searchType: '',
+      searchTypeText: '',
+      warehouseList: [
+        {
+          contractNo: '快付款',
+        },
+      ],
+    }
+  },
+  activated() {},
+  methods: {
+    inspectInfo(index) {
+      //添加,编辑，查看
+      this.$router.push({ path: 'inspectInfo', query: { type: index } })
+    },
+    selecttaskType() {},
+    del() {
+      //删除
+      this.$confirm('确定删除质检信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+    },
+    // commit() {
+    //   //保存
+    //   this.$confirm('确定保存质检信息？', '提示', {
+    //     confirmButtonText: '确定',
+    //     cancelButtonText: '取消',
+    //     type: 'warning',
+    //   })
+    //     .then(() => {})
+    //     .catch(() => {
+    //       return false
+    //     })
+    // },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.title {
+  font-size: 20px;
+  font-weight: 600;
+  margin: 20px 0 0 20px;
+}
+.tit {
+  font-size: 16px;
+  font-weight: 600;
+  margin: 20px;
+}
+.ws-info-table {
+  border: none;
+}
+.ws-info-table .el-form-item {
+  width: 50%;
+  border: none;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 30%;
+  text-align: center;
+  background: #ffffff;
+  color: #8890b1;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
+/deep/.el-table--enable-row-transition .el-table__body td {
+  text-align: center;
+}
+</style>

src/views/houseSelfCollect/paymentManagement.vue

@@ -0,0 +1,389 @@
+<!--付款管理-->
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="12">
+      <template slot="left">
+        <ws-button type="primary">待结算</ws-button>
+        <ws-button type="primary">待审核</ws-button>
+        <ws-button type="primary">全部</ws-button>
+        <ws-button type="primary" @click="reject">驳回</ws-button>
+        <ws-button type="primary" @click="adopt">通过</ws-button>
+        <ws-button type="primary" @click="payment">付款</ws-button>
+        <ws-button type="primary" @click="examine">审核</ws-button>
+      </template>
+      <template slot="right">
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          @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>
+        <div></div>
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按编号、客户名、车牌号查找"
+          clearable
+          maxlength="500"
+          type="input"
+        ></ws-input>
+        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
+        <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>
+      </template>
+    </BaseHeaderLayout>
+    <el-table
+      :data="warehouseList"
+      style="width: 100%; margin-top: 20px"
+      ref="warehouseList"
+      border
+      height="780"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        :selectable="selectInit"
+        type="selection"
+        width="55"
+      ></el-table-column>
+      <el-table-column type="index" label="序号" width="50">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="contractNo"
+        width="120"
+        label="编号"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="closePositionDate"
+        label="客户"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="closingQuantity"
+        label="车牌号"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="transactionPrice"
+        label="货名"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="closeRate"
+        label="净重单价（元/公斤）"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="basisPrice"
+        label="纯重单价（元/公斤）"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="amountIngPayable"
+        label="净重（公斤）"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="amountEdPayable"
+        label="纯重（公斤）"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="amountNotPayable"
+        label="应付款(元)"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="paymentDate"
+        label="已付款(元)"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="collectionIngPayable"
+        label="更新时间"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="collectionEdPayable"
+        label="状态"
+      ></el-table-column>
+      <el-table-column
+        class="table_td"
+        prop="collectionEdPayable"
+        label="操作"
+        width="350"
+      >
+        <el-button @click="del">删除</el-button>
+        <el-button @click="settlement(1)">结算</el-button>
+        <el-button @click="settlement(2)">查看</el-button>
+        <el-button>打印</el-button>
+      </el-table-column>
+    </el-table>
+    <!-- 付款弹窗 -->
+    <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true">
+      <ws-form>
+        <ws-info-table>
+          <ws-form-item label="未付金额（元）" prop="waterContent">
+            <ws-input
+              placeholder="请输入未付金额（元）"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item label="本次付款金额（元）" prop="waterContent">
+            <ws-input
+              placeholder="请输入本次付款金额（元）"
+              maxlength="100"
+              size="small"
+            />
+          </ws-form-item>
+          <ws-form-item label="付款日期" prop="waterContent">
+            <el-date-picker v-model="value1" type="date" placeholder="选择日期">
+            </el-date-picker>
+          </ws-form-item>
+        </ws-info-table>
+        <div style="text-align: center">
+          <el-button @click="paymentForm = false">取消</el-button>
+          <el-button @click="paymentSubmit">提交</el-button>
+        </div>
+      </ws-form>
+    </el-dialog>
+    <!-- <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint> -->
+    <div style="text-align:center">
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="deptBudgetTotal"
+    >
+    </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+import {} from '@/model/houseSelfCollect/index'
+import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
+
+export default {
+  components: {
+    houseSelfCollectPrint,
+  },
+  watch: {},
+  data() {
+    return {
+      //分页
+      currentPage: 1,
+      pageSize: 10,
+      deptCircularPage:{},
+      deptBudgetTotal: 0,
+      warehouseList: [
+        {
+          collectionEdPayable: '快付款',
+        },
+      ],
+      paymentForm: false,
+      taskTypeList: ['一号库'],
+      searchType: '',
+      searchTypeText: '',
+      searchKeyWord: '',
+      value1: '', //付款日期
+      modification: [],
+    }
+  },
+  activated() {},
+  methods: {
+    del() {
+      this.$confirm(
+        '对应的质检和检斤记录将一并删除，是否确定删除操作？',
+        '提示',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }
+      )
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+    },
+    settlement(index) {
+      this.$router.push({ path: 'settlement', query: { type: index } })
+    },
+    payment() {
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要付款的条目')
+      } else {
+        this.paymentForm = true
+      }
+    },
+    paymentSubmit() {
+      this.$confirm('确定提交付款信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+    },
+    reject() {
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要驳回的条目')
+      } else {
+        this.$confirm('驳回后任务将退回到统计，是否确定驳回？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+          .then(() => {})
+          .catch(() => {
+            return false
+          })
+      }
+    },
+    adopt() {
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要通过的条目')
+      } else {
+        this.$confirm(
+          '审核通过后，任务将发送给决策人，是否确定通过？',
+          '提示',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          }
+        )
+          .then(() => {})
+          .catch(() => {
+            return false
+          })
+      }
+    },
+    examine() {
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要审核的条目')
+      } else {
+        this.$confirm('审核通过后，任务将发送给财务，是否确定通过？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        })
+          .then(() => {})
+          .catch(() => {
+            return false
+          })
+      }
+    },
+    // print(){
+    //   // this.xx = true;
+    //   let newstr = document.getElementById("print").innerHTML;
+    //   let oldstr = document.body.innerHTML;
+    //   document.body.innerHTML = newstr;
+    //   window.print();
+    //   document.body.innerHTML = oldstr;
+    //   // window.location.reload()
+    //    this.$router.push({ path: 'paymentManagement' })
+    // },
+    selectInit(row) {
+      //在这里一定要记得类型匹配的上。
+      if (row.approveStatus == null) {
+        return true
+      } else if (row.approveStatus != null) {
+        if (row.taskId == null) {
+          return false
+        } else {
+          return true
+        }
+      }
+    },
+    handleSelectionChange(val) {
+      this.modification = val
+    },
+    // handleRowClick(row) {
+    //   if (row.approveStatus == null) {
+    //     this.$refs.warehouseList.toggleRowSelection(row)
+    //     return true
+    //   } else if (row.approveStatus != null) {
+    //     if (row.taskId == null) {
+    //       return false
+    //     } else {
+    //       this.$refs.warehouseList.toggleRowSelection(row)
+    //       return true
+    //     }
+    //   }
+    // },
+    selecttaskType() {},
+     handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.ws-info-table {
+  border: none;
+}
+.ws-info-table .el-form-item {
+  width: 50%;
+  border: none;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 30%;
+  text-align: center;
+  background: #ffffff;
+  color: #8890b1;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+.title {
+  font-size: 16px;
+  font-weight: 600;
+}
+.formItem {
+  width: 70% !important;
+}
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
+/deep/.el-table--enable-row-transition .el-table__body td {
+  text-align: center;
+}
+</style>
+

src/views/houseSelfCollect/settlement.vue

@@ -0,0 +1,454 @@
+<!--结算-->
+<template>
+  <div class="center">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left titleup">{{information}}信息</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="cancel"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+    <div class="substance">
+      <ws-form>
+        <div style="width: 60%; margin: 0 auto">
+          <div class="title">基本信息</div>
+          <ws-info-table>
+            <ws-form-item label="编号" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入编号"
+                maxlength="100"
+                disabled
+                size="small"
+              />
+            </ws-form-item>
+            <ws-form-item label="仓位号" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入仓位号"
+                maxlength="100"
+                size="small"
+              disabled
+              />
+            </ws-form-item>
+            <ws-form-item label="客户" span="1" prop="waterContent">
+              <ws-select
+                v-model="warehouseList.a"
+                placeholder="请输入货名"
+                class="typeselect"
+                @change="selectpackingMethod"
+               disabled
+              >
+                <ws-option
+                  v-for="item in goodnameList"
+                  :key="item.constKey"
+                  :label="item.constValue"
+                  :value="item.constValue"
+                />
+              </ws-select>
+            </ws-form-item>
+            <ws-form-item label="囤位号" span="1" prop="waterContent">
+              <ws-input placeholder="请输入客户" maxlength="100" size="small" disabled />
+            </ws-form-item>
+            <ws-form-item label="车牌号" span="1" prop="waterContent">
+              <ws-input placeholder="请输入客户" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+            <ws-form-item label="货名" span="1" prop="waterContent">
+              <ws-input placeholder="请输入客户" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+          </ws-info-table>
+
+          <div class="title">质检数据</div>
+          <ws-info-table>
+            <ws-form-item label="等级" span="1" prop="waterContent">
+              <ws-input placeholder="请输入编号" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+            <ws-form-item label="杂质（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入杂质占比"
+                maxlength="100"
+                size="small"
+               disabled
+              />
+            </ws-form-item>
+            <ws-form-item label="水分（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入水分占比"
+                maxlength="100"
+                size="small"
+                disabled
+              />
+            </ws-form-item>
+            <ws-form-item label="霉变粒（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入霉变粒占比"
+                maxlength="100"
+                size="small"
+                disabled
+              />
+            </ws-form-item>
+            <ws-form-item label="容重（克/升）" span="1" prop="waterContent">
+              <ws-input placeholder="请输入容重" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+            <ws-form-item label="热损伤（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入热损伤占比"
+                maxlength="100"
+                size="small"
+                disabled
+              />
+            </ws-form-item>
+            <ws-form-item label="不完整粒（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入不完整粒占比"
+                maxlength="100"
+                size="small"
+                disabled
+              />
+            </ws-form-item>
+          </ws-info-table>
+
+          <div class="title">单价核算</div>
+          <ws-info-table>
+            <ws-form-item label="潮粮水分（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入潮粮水分"
+                maxlength="100"
+                size="small"
+                disabled
+              />
+            </ws-form-item>
+            <ws-form-item label="扣重比" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入扣重比"
+                maxlength="100"
+                size="small"
+                :disabled = "disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="干粮水分（%）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入干粮水分"
+                maxlength="100"
+                size="small"
+                disabled
+              />
+            </ws-form-item>
+            <ws-form-item label="扣重" span="1" prop="waterContent">
+              <ws-input placeholder="请输入扣重" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+            <ws-form-item label="掉水(%)" span="1" prop="waterContent">
+              <ws-input placeholder="请输入掉水" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+            <ws-form-item label="基数" span="1" prop="waterContent">
+              <ws-input placeholder="请输入基数" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+            <ws-form-item label="毛重（公斤）" span="1" prop="waterContent">
+              <ws-input placeholder="请输入毛重" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+            <ws-form-item label="纯重（公斤）" span="1" prop="waterContent">
+              <ws-input placeholder="请输入纯重" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+            <ws-form-item label="皮重（公斤）" span="1" prop="waterContent">
+              <ws-input placeholder="请输入皮重" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+            <ws-form-item
+              label="净重单价（元/公斤）"
+              span="1"
+              prop="waterContent"
+            >
+              <ws-input
+                placeholder="请输入净重单价"
+                maxlength="100"
+                size="small"
+              disabled
+              />
+            </ws-form-item>
+            <ws-form-item label="扣杂（公斤）" span="1" prop="waterContent">
+              <ws-input placeholder="请输入扣杂" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+            <ws-form-item
+              label="纯重单价（元/公斤）"
+              span="1"
+              prop="waterContent"
+            >
+              <ws-input
+                placeholder="请输入纯重单价"
+                maxlength="100"
+                size="small"
+                disabled
+              />
+            </ws-form-item>
+            <ws-form-item label="净重（公斤）" span="1" prop="waterContent">
+              <ws-input placeholder="请输入净重" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+          </ws-info-table>
+
+          <div class="title">核算金额（元）</div>
+          <ws-info-table>
+            <ws-form-item
+              label="粮款 = 净重 x 净重单价 ="
+              span="1"
+              prop="waterContent"
+              class="formItem"
+            >
+              <ws-input placeholder="请输入粮款" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+            <ws-form-item label="称重补助" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入称重补助"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="称重扣款" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入称重扣款"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="运费补助" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入运费补助"
+                maxlength="100"
+                :disabled="disabled"
+                size="small"
+              />
+            </ws-form-item>
+            <ws-form-item label="运费扣款" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入运费扣款"
+                maxlength="100"
+                :disabled="disabled"
+                size="small"
+              />
+            </ws-form-item>
+            <ws-form-item label="卸车补助" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入卸车补助"
+                maxlength="100"
+                :disabled="disabled"
+                size="small"
+              />
+            </ws-form-item>
+            <ws-form-item label="卸车扣款" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入卸车扣款"
+                maxlength="100"
+                :disabled="disabled"
+                size="small"
+              />
+            </ws-form-item>
+            <ws-form-item label="其他补助" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入其他补助"
+                maxlength="100"
+                :disabled="disabled"
+                size="small"
+              />
+            </ws-form-item>
+            <ws-form-item label="其他扣款" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入其他扣款"
+                maxlength="100"
+                :disabled="disabled"
+                size="small"
+              />
+            </ws-form-item>
+            <ws-form-item
+              label="计算应付 = 粮款 + 补助- 扣款 ="
+              span="1"
+              prop="waterContent"
+              class="formItem"
+            >
+              <ws-input
+                placeholder="请输入计算应付"
+                maxlength="100"
+               disabled
+                size="small"
+              />
+            </ws-form-item>
+            <ws-form-item label="实际付款" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入实际付款"
+                maxlength="100"
+                :disabled="disabled"
+                size="small"
+              />
+            </ws-form-item>
+            <ws-form-item label="人民币大写" span="1" prop="waterContent">
+              <ws-input
+                placeholder="请输入人民币大写"
+                maxlength="100"
+                disabled
+                size="small"
+              />
+            </ws-form-item>
+            <!-- <ws-form-item
+              label="纯重单价（元/公斤）"
+              span="1"
+              prop="waterContent"
+            >
+              <ws-input
+                placeholder="请输入纯重单价"
+                maxlength="100"
+                :disabled="disabled"
+                size="small"
+              />
+            </ws-form-item> -->
+            <ws-form-item label="记事（选填）" span="1" prop="waterContent">
+              <ws-input
+                placeholder="备注信息，不超过20个字"
+                maxlength="100"
+                :disabled="disabled"
+                size="small"
+              />
+            </ws-form-item>
+          </ws-info-table>
+          <div class="but">
+            <el-button @click="cancel" v-if="this.types == 2" type="primary">取消</el-button>
+            <el-button @click="print" v-if="this.types == 2" type="primary">保存并打印</el-button>
+            <el-button @click="cancel" v-if="this.types == 1" type="primary">关闭</el-button>
+          </div>
+        </div>
+      </ws-form>
+    </div>
+    <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint>
+  </div>
+</template>
+<script>
+import {} from '@/model/houseSelfCollect/index'
+import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
+export default {
+  components: {
+    houseSelfCollectPrint,
+  },
+  watch: {},
+  data() {
+    return {
+      warehouseList: {},
+      disabled:false,
+      types:'',
+      information:'结算',
+    }
+  },
+  activated() {
+    this.types = this.$route.query.type
+    if( this.types == 2){
+         this.disabled=true
+         this.information = '查看'
+         
+    }
+    console.log( this.information)
+  },
+  methods: {
+    print() {
+      // this.xx = true;
+      let newstr = document.getElementById('print').innerHTML
+      let oldstr = document.body.innerHTML
+      document.body.innerHTML = newstr
+      window.print()
+      document.body.innerHTML = oldstr
+      // window.location.reload()
+      this.$router.push({ path: 'paymentManagement' })
+    },
+    cancel() {
+      this.$router.push({ path: 'paymentManagement' })
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.center {
+  background: #f6f7fc;
+}
+
+.ws-info-table {
+  border: none;
+}
+.ws-info-table .el-form-item {
+  width: 40%;
+  border: none;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 30%;
+  text-align: center;
+  background: #ffffff;
+  font-size: 14px;
+  color: #8890b1;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+.title {
+  font-size: 16px;
+  font-weight: 600;
+  margin: 10px;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 15px;
+  background: #8890b1;
+  margin-right: 5px;
+}
+
+.substance {
+  background: #ffffff;
+  width: 100%;
+  border-radius: 4px;
+  margin: 0 auto;
+  padding-top: 20px;
+}
+.formItem {
+  width: 70% !important;
+}
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
+/deep/.el-table--enable-row-transition .el-table__body td {
+  text-align: center;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 15px 0px;
+}
+.titleup {
+  position: relative;
+}
+.titleup::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.but {
+  text-align: center;
+  margin: 20px auto;
+}
+</style>

src/views/houseSelfCollect/weighingManagement.vue

@@ -0,0 +1,309 @@
+<!--检斤管理-->
+<template>
+  <div>
+    <BaseHeaderLayout :leftSpan="12">
+      <template slot="left"> </template>
+      <template slot="right">
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          @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>
+        <div></div>
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按编号、客户名、车牌号查找"
+          clearable
+          maxlength="500"
+          type="input"
+        ></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>
+      </template>
+    </BaseHeaderLayout>
+    <el-table
+      :data="warehouseList"
+      style="width: 100%; margin-top: 20px"
+      ref="warehouseList"
+      border
+      height="780"
+    >
+      <el-table-column type="index" label="序号" width="50">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="contractNo"
+        width="120"
+        label="编号"
+      ></el-table-column>
+      <el-table-column prop="contractNo" label="客户"></el-table-column>
+      <el-table-column prop="contractNo" label="车牌号"></el-table-column>
+      <el-table-column prop="contractNo" label="货名"></el-table-column>
+
+      <el-table-column prop="contractNo" label="毛重（公斤）"></el-table-column>
+      <el-table-column prop="contractNo" label="皮重（公斤）"></el-table-column>
+      <el-table-column prop="contractNo" label="仓位号"></el-table-column>
+      <el-table-column prop="contractNo" label="囤位号"></el-table-column>
+      <el-table-column prop="contractNo" label="司称员"></el-table-column>
+      <el-table-column prop="contractNo" label="称重时间"></el-table-column>
+      <el-table-column prop="contractNo" label="状态"></el-table-column>
+      <el-table-column width="300" prop="contractNo1" label="操作">
+        <el-button @click="GrossWeight">毛重</el-button>
+        <el-button @click="tare">皮重</el-button>
+        <el-button @click="print">打印</el-button>
+      </el-table-column>
+    </el-table>
+
+    <!-- 毛重检斤 -->
+    <el-dialog width="40%" :visible.sync="paymentForm" :append-to-body="true">
+      <ws-form>
+        <div class="title">毛重检斤</div>
+        <ws-info-table>
+          <ws-form-item label="编号"  prop="waterContent">
+            <ws-input placeholder="请输入编号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="仓位号" prop="waterContent">
+            <ws-input placeholder="请输入仓位号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="客户" prop="waterContent">
+            <ws-input placeholder="请输入客户" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="囤位号" prop="waterContent">
+            <ws-input placeholder="请输入囤位号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="车牌号" prop="waterContent">
+            <ws-input placeholder="请输入车牌号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="货名" prop="waterContent">
+            <ws-input placeholder="请输入货名" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="毛重（公斤）" prop="waterContent">
+            <ws-input placeholder="请输入毛重" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <div><el-button @click="Reacquire">重新获取</el-button></div>
+        </ws-info-table>
+        <div style="text-align: center">
+          <el-button @click="paymentForm = false">取消</el-button>
+          <el-button @click="commit">保存</el-button>
+        </div>
+      </ws-form>
+    </el-dialog>
+    <!-- 皮重检斤 -->
+    <el-dialog width="40%" :visible.sync="paymentForm1" :append-to-body="true">
+      <ws-form>
+        <div class="title">皮重检斤</div>
+        <ws-info-table>
+          <ws-form-item label="编号" prop="waterContent">
+            <ws-input placeholder="请输入编号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="仓位号" prop="waterContent">
+            <ws-input placeholder="请输入仓位号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="客户" prop="waterContent">
+            <ws-input placeholder="请输入客户" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="囤位号" prop="waterContent">
+            <ws-input placeholder="请输入囤位号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="车牌号" prop="waterContent">
+            <ws-input placeholder="请输入车牌号" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item label="货名" prop="waterContent">
+            <ws-input placeholder="请输入货名" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item
+            label="毛重（公斤）"
+            prop="waterContent"
+            class="formItem"
+          >
+            <ws-input placeholder="请输入毛重" maxlength="100" disabled size="small" />
+          </ws-form-item>
+          <ws-form-item
+            label="皮重（公斤）"
+            prop="waterContent"
+            class="formItem"
+          >
+            <ws-input placeholder="请输入皮重" maxlength="100" size="small" />
+            <el-button @click="Reacquire">重新获取</el-button>
+          </ws-form-item>
+          <ws-form-item
+            label="扣杂（公斤）"
+            prop="waterContent"
+            class="formItem"
+          >
+            <ws-input placeholder="请输入扣杂" maxlength="100" size="small" />
+          </ws-form-item>
+          <ws-form-item
+            label="净重（公斤）"
+            prop="waterContent"
+            class="formItem"
+          >
+            <ws-input placeholder="请输入净重" maxlength="100" disabled size="small" />
+          </ws-form-item>
+        </ws-info-table>
+        <div style="text-align: center">
+          <el-button @click="paymentForm1 = false">取消</el-button>
+          <el-button @click="submit">保存</el-button>
+        </div>
+      </ws-form>
+    </el-dialog>
+    <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint>
+     <div style="text-align:center">
+    <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize"
+      layout="total, sizes, prev, pager, next, jumper"
+      :total="deptBudgetTotal"
+    >
+    </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
+import {} from '@/model/houseSelfCollect/index'
+export default {
+  components: {
+    houseSelfCollectPrint,
+  },
+  watch: {},
+  data() {
+    return {
+       //分页
+      currentPage: 1,
+      pageSize: 10,
+      deptCircularPage:{},
+      deptBudgetTotal: 0,
+      paymentForm: false,
+      paymentForm1: false,
+      warehouseList: [
+        {
+          contractNo: '56454',
+        },
+      ],
+      searchKeyWord: '',
+      searchType: [],
+      searchTypeText: '',
+      value1: '', //选择时间
+      taskTypeList: [],
+    }
+  },
+  activated() {},
+  methods: {
+    GrossWeight() {
+      //毛重
+      this.paymentForm = true
+    },
+    tare() {
+      //皮重
+      this.paymentForm1 = true
+    },
+    selecttaskType() {
+      //选择仓库改变方法
+    },
+    Reacquire() {
+      //重新获取
+    },
+    commit() {
+      //毛重保存
+      this.$confirm('确定保存检斤信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+    },
+    submit() {//皮重保存
+       this.$confirm('确定保存检斤信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {})
+        .catch(() => {
+          return false
+        })
+    },
+    print() {
+      let newstr = document.getElementById('print').innerHTML
+      let oldstr = document.body.innerHTML
+      document.body.innerHTML = newstr
+      window.print()
+      document.body.innerHTML = oldstr
+      // window.location.reload()
+      this.$router.push({ path: 'paymentManagement' })
+    },
+     handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val
+      console.log(`当前页: ${val}`)
+      this.getList()
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.title {
+  font-size: 20px;
+  font-weight: 600;
+  margin: 20px;
+}
+.ws-info-table {
+  border: none;
+}
+.ws-info-table .el-form-item {
+  width: 50%;
+  border: none;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 30%;
+  text-align: center;
+  background: #ffffff;
+  color: #8890b1;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+/deep/.el-table .el-table__header .cell,
+.el-table .el-table__body .cell {
+  text-align: center;
+}
+/deep/.el-table--enable-row-transition .el-table__body td {
+  text-align: center;
+}
+.formItem {
+  width: 51% !important;
+}
+</style>

src/views/statisticalReport/autoSettlementList.vue

@@ -1147,25 +1147,13 @@ export default {
             this.$message.warning(req.message)
           })
       } else {
-        if (status) {
+        if (status==true) {
           this.$message.success('通过成功')
           this.getList()
-        } else if (!status) {
-          if (status1 == 2) {
-            postaudit({
-              flag: 2,
-              tranSettlementReportList: this.modification,
-            })
-              .toPromise()
-              .then((response) => {
-                this.$message.success('驳回成功')
-                this.getList()
-              })
-              .catch((req) => {
-                this.$message.success('驳回失败')
-              })
+        } else if (status==false) {
+          this.$message.success('驳回成功')
+          this.getList()
           }
-        }
       }
     },
     handlereject(status) {

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -521,23 +521,13 @@ export default {
             this.$message.warning(req.message)
           })
       } else {
-        if (status) {
+        if (status==true) {
           this.$message.success('通过成功')
           this.getList()
-        } else if (!status) {
-          closeaudit({
-            flag: 2,
-            purchaseReceiptReportList: this.modification,
-          })
-            .toPromise()
-            .then((response) => {
-              this.$message.success('驳回成功')
-              this.getList()
-            })
-            .catch((req) => {
-              this.$message.success('驳回失败')
-            })
-        }
+        } else if (status==false) {
+          this.$message.success('驳回成功')
+          this.getList()
+          }
       }
     },
     //统计审核
@@ -551,11 +541,6 @@ export default {
           confirmButtonText: '确定',
           type: 'warning',
         }).then(() => {
-          // closeaudit({roleFlag:1,flag:1,purchaseClosingReportList:this.modification}).toPromise()
-          // .then(response => {
-          //   this.$message.success('审核成功')
-          //   this.getList()
-          // })
           that.audit(this.modification[0], 0, true, 1)
         })
       }
@@ -571,13 +556,6 @@ export default {
           confirmButtonText: '确定',
           type: 'warning',
         }).then(() => {
-          // postaudit({roleFlag:status,flag:2,purchaseClosingReportList:this.modification}).toPromise()
-          // .then(response => {
-          //   this.$message.success('驳回成功')
-          //   this.getList()
-          // }).catch(req => {
-          //   this.$message.success('驳回失败')
-          // })
           that.audit(this.modification[0], 0, false, true, '已驳回')
         })
       }

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -934,15 +934,6 @@ export default {
           confirmButtonText: '确定',
           type: 'warning',
         }).then(() => {
-          // postaudit({
-          //   roleFlag: 1,
-          //   purchaseReceiptReportList: this.modification,
-          // })
-          //   .toPromise()
-          //   .then((response) => {
-          //     this.$message.success('审核成功')
-          //     this.getList()
-          //   })
           that.audit(this.modification[0], 0, true)
         })
       }
@@ -963,25 +954,13 @@ export default {
             this.$message.warning(req.message)
           })
       } else {
-        if (status) {
+        if (status==true) {
           this.$message.success('通过成功')
           this.getList()
-        } else if (!status) {
-          if (status1 == 2) {
-            postaudit({
-              flag: 2,
-              purchaseReceiptReportList: this.modification,
-            })
-              .toPromise()
-              .then((response) => {
-                this.$message.success('驳回成功')
-                this.getList()
-              })
-              .catch((req) => {
-                this.$message.success('驳回失败')
-              })
+        } else if (status==false) {
+          this.$message.success('驳回成功')
+          this.getList()
           }
-        }
       }
     },
     handlereject(status) {
@@ -994,19 +973,6 @@ export default {
           confirmButtonText: '确定',
           type: 'warning',
         }).then(() => {
-          // postaudit({
-          //   roleFlag: status,
-          //   flag: 2,
-          //   purchaseReceiptReportList: this.modification,
-          // })
-          //   .toPromise()
-          //   .then((response) => {
-          //     this.$message.success('驳回成功')
-          //     this.getList()
-          //   })
-          //   .catch((req) => {
-          //     this.$message.success('驳回失败')
-          //   })
           that.audit(this.modification[0], 0, false, true, '已驳回')
         })
       }

src/views/statisticalReport/salesClosingCashierList.vue

@@ -382,10 +382,6 @@ export default {
         transactionsNumber: '',
         basis: '',
         submissionDate: '',
-        // delivery: false,
-        // type: [],
-        // resource: '',
-        // desc: ''
       },
       formLabelWidth: '140px',
       isShow: !this.autohide,
@@ -411,13 +407,6 @@ export default {
       enter: {
         closePositionList: [],
       },
-      // taskTypeList:[
-      //   {value:'待审核',type:1},
-      //   {value:'已完成',type:2},
-      //   {value:'已通过',type:3},
-      //   {value:'已成交',type:4},
-      // ],
-
       // 提交类型
       submitType: true,
       multipleSelection: [],
@@ -487,23 +476,13 @@ export default {
             this.$message.warning(req.message)
           })
       } else {
-        if (status) {
+        if (status==true) {
           this.$message.success('通过成功')
           this.getList()
-        } else if (!status) {
-          postsaleaudit({
-            flag: 2,
-            purchaseReceiptReportList: this.multipleSelection,
-          })
-            .toPromise()
-            .then((response) => {
-              this.$message.success('驳回成功')
-              this.getList()
-            })
-            .catch((req) => {
-              this.$message.success('驳回失败')
-            })
-        }
+        } else if (status==false) {
+          this.$message.success('驳回成功')
+          this.getList()
+          }
       }
     },
     dataFilter(val) {
@@ -679,13 +658,6 @@ export default {
             confirmButtonText: '确定',
             type: 'warning',
           }).then(() => {
-            // postsaleaudit({salesClosingReportList:this.multipleSelection,roleFlag:1,flag:1}).toPromise()
-            // .then(response => {
-            //   this.$message.success('通过成功')
-            //   this.getList()
-            // }) .catch(() => {
-            //   this.$message.warning('通过失败')
-            // })
             that.audit(this.multipleSelection[0], 0, true)
           })
         } else {

src/views/statisticalReport/salesDeliveryReportList.vue

@@ -621,23 +621,13 @@ export default {
             this.$message.warning(req.message)
           })
       } else {
-        if (status) {
+       if (status==true) {
           this.$message.success('通过成功')
           this.getList()
-        } else if (!status) {
-          issueapproval({
-            flag: 2,
-            purchaseReceiptReportList: this.modification,
-          })
-            .toPromise()
-            .then((response) => {
-              this.$message.success('驳回成功')
-              this.getList()
-            })
-            .catch((req) => {
-              this.$message.success('驳回失败')
-            })
-        }
+        } else if (status==false) {
+          this.$message.success('驳回成功')
+          this.getList()
+          }
       }
     },
     handlereject(status) {
@@ -651,13 +641,6 @@ export default {
           type: 'warning',
         }).then(() => {
           that.audit(this.modification[0], 0, false, true, '已驳回')
-          // issueapproval({roleFlag:status,flag:2,salesDeliveryReportList:this.modification}).toPromise()
-          // .then(response => {
-          //   this.$message.success('驳回成功')
-          //   this.getList()
-          // }).catch(req => {
-          //   this.$message.success('驳回失败')
-          // })
         })
       }
     },
@@ -671,13 +654,6 @@ export default {
           confirmButtonText: '确定',
           type: 'warning',
         }).then(() => {
-          // issueapproval({roleFlag:2,flag:1,salesDeliveryReportList:this.modification}).toPromise()
-          // .then(response => {
-          //   this.$message.success('通过成功')
-          //   this.getList()
-          // }).catch(req => {
-          //   this.$message.success('通过失败')
-          // })
           that.audit(this.modification[0], 0, true)
         })
       }

src/views/tranManagement/component/routers/route.js

@@ -208,7 +208,7 @@ const tranManagementRouter = {
       },
       hidden: true
     },
-    
+
     //发货反馈
     {
       path: 'tranManagementTransporHairRespond',
@@ -238,7 +238,21 @@ const tranManagementRouter = {
       },
       hidden: true
     },
-
+    //火运装车反馈
+    {
+      path: 'tranManagementFireFeedback',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementFireFeedback'),
+      name: 'tranManagementFireFeedback',
+      meta: {
+        title: 'tranManagementFireFeedback',
+        shortcutEntrance: 'tranManagement',
+        module: 'transportationTask.transportation',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
     //反馈查看
     {
       path: 'tranManagementTransporFeedbackLook',
@@ -252,6 +266,19 @@ const tranManagementRouter = {
       },
       hidden: true
     },
+    //火运装车反馈查看
+    {
+      path: 'tranManagementFireFeedbackLook',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementFireFeedbackLook'),
+      name: 'tranManagementFireFeedbackLook',
+      meta: {
+        title: 'tranManagementFireFeedbackLook',
+        shortcutEntrance: 'tranManagement',
+        module: 'transportationTask.transportation',
+      },
+      hidden: true
+    },
 
     //收货反馈
     {
@@ -282,6 +309,21 @@ const tranManagementRouter = {
       },
       hidden: true
     },
+    //火运卸车反馈
+    {
+      path: 'tranManagementFireReceivingFeedback',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementFireReceivingFeedback'),
+      name: 'tranManagementFireReceivingFeedback',
+      meta: {
+        title: 'tranManagementFireReceivingFeedback',
+        shortcutEntrance: 'tranManagement',
+        module: 'transportationTask.transportation',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
     //反馈查看
     {
       path: 'tranManagementReceivingloadingLook',
@@ -297,6 +339,21 @@ const tranManagementRouter = {
       },
       hidden: true
     },
+    //火运卸车反馈查看
+    {
+      path: 'tranManagementFireReceivingFeedbackLook',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementFireReceivingFeedbackLook'),
+      name: 'tranManagementFireReceivingFeedbackLook',
+      meta: {
+        title: 'tranManagementFireReceivingFeedbackLook',
+        shortcutEntrance: 'tranManagement',
+        module: 'transportationTask.transportation',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
     //司机管理
     {
       path: 'driverManagement',
@@ -313,4 +370,4 @@ const tranManagementRouter = {
     },
   ],
 };
-export default tranManagementRouter;  
+export default tranManagementRouter;

src/views/tranManagement/tranManagementFireFeedback.vue

@@ -0,0 +1,1048 @@
+//装车反馈
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left title">火运装车反馈</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+    <ws-form
+      class="position"
+      ref="deptBudgetList"
+      :rules="rules"
+      :model="deptBudgetList"
+    >
+      <div class="small-title" style="font-size: 16px">任务详情</div>
+      <ws-info-table>
+        <!--任务编号-->
+        <ws-form-item label="任务编号" span="1" prop="processNo">
+          {{ deptBudgetList.processNo }}
+        </ws-form-item>
+        <!--货名-->
+        <ws-form-item label="货名" span="1" prop="goodsName">
+          {{ deptBudgetList.goodsName }}
+        </ws-form-item>
+        <!--重量（吨）-->
+        <ws-form-item label="重量（吨）" span="1" prop="weight">
+          {{ deptBudgetList.weight }}
+        </ws-form-item>
+        <!--发货地址-->
+        <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
+          {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
+          }}{{ deptBudgetList.sendArea }}
+        </ws-form-item>
+        <!--发货人-->
+        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
+          {{ deptBudgetList.sender }}
+        </ws-form-item>
+        <!--发货人电话-->
+        <ws-form-item
+          label="发货人电话"
+          span="1"
+          prop="senderPhone"
+          class="readonly"
+        >
+          {{ deptBudgetList.senderPhone }}
+        </ws-form-item>
+        <!--收货地址-->
+        <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
+          {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
+          }}{{ deptBudgetList.receiveArea }}
+        </ws-form-item>
+        <!--收货人-->
+        <ws-form-item label="收货人" span="1" prop="receiver">
+          {{ deptBudgetList.receiver }}
+        </ws-form-item>
+        <!--收货人电话-->
+        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
+          {{ deptBudgetList.receiverPhone }}
+        </ws-form-item>
+        <!--发货日期-->
+        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
+          {{ deptBudgetList.deliveryDateStart }}
+        </ws-form-item>
+        <!--最晚到货日期-->
+        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
+          {{ deptBudgetList.deliveryDateEnd }}
+        </ws-form-item>
+        <!--合同编号-->
+        <ws-form-item label="合同编号" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+        <!-- 运输方式 -->
+        <ws-form-item label="运输方式" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+      </ws-info-table>
+      <div class="small-title" style="font-size: 16px">联络员及车次</div>
+      <div class="lianluoyuan">
+        <div
+          style="width: 100%"
+          class="flex position"
+          v-for="(item, index) in this.freightspace"
+          :key="index"
+        >
+        <ws-info-table>
+          <!--姓名-->
+          <ws-form-item label="姓名:" span="1" prop="driver">
+            <span>{{ item.driver }}</span>
+          </ws-form-item>
+          <!--电话-->
+          <ws-form-item label="电话:" span="1" prop="driverPhone">
+            <span>{{ item.driverPhone }}</span>
+          </ws-form-item>
+          <!--发车日期-->
+          <el-form-item label="发车日期:" span="1" prop="sendDateStart">
+            <ws-date-picker
+              v-model="item.sendDateStart"
+              type="date"
+              style="width: 150px"
+              placeholder="请选择日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
+          <!--预计到站日期-->
+          <ws-form-item label="预计到站日期:" span="1" prop="receiveDateEnd">
+            <span>{{ item.receiveDateEnd }}</span>
+          </ws-form-item>
+          <!--车型-->
+          <ws-form-item label="车型:" span="1" prop="caeModel">
+            <span>{{ item.carModel }}</span>
+          </ws-form-item>
+        </ws-info-table>
+      </div>
+      </div>
+      <div class="small-title" style="font-size: 16px">装车详情</div>
+      <div class="liaison">
+        <div
+          style="width: 100%"
+          class="flex position"
+          v-for="(item, index) in this.freightspace"
+          :key="index"
+        >
+          <ws-info-table>
+            <!--车厢号-->
+            <div class="catNos">
+             车厢号-{{ index + 1 }}
+            </div>
+            <ws-form-item label="车厢号:" span="1" prop="boxNo">
+              <span>{{ item.boxNo }}</span>
+            </ws-form-item>
+            <!--装车净重-->
+            <ws-form-item label="装车净重：" span="1" prop="loadNetWeight">
+              <ws-input
+                v-if="item.status == '已装车' || item.status == '已送达'"
+                :disabled="readonly"
+                v-model="item.loadNetWeight"
+                placeholder="请输入装车净重"
+                maxlength="20"
+                size="small"
+              />
+              <ws-input
+                v-else
+                v-model="item.loadNetWeight"
+                placeholder="请输入装车净重"
+                maxlength="20"
+                size="small"
+              />
+            </ws-form-item>
+            <!--磅单-->
+            <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
+              <!-- slot-scope="scope" -->
+              <template>
+                <el-upload
+                  action="https://www.zthymaoyi.com/upload/admin"
+                  :show-file-list="false"
+                  :on-success="
+                    (res) => {
+                      uploadSuccessHandle1(res, index)
+                    }
+                  "
+                  class="avatar-uploader"
+                  accept=".jpg, .jpeg, .png, .gif"
+                  ><img
+                    width="18"
+                    height="20"
+                    style="vertical-align: text-top; position: relative"
+                    src="../../../public/img/fujian.png"
+                    alt=""
+                  />
+                </el-upload>
+                <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[index].loadPoundImg != null
+                  "
+                  >1</span
+                >
+                <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
+                  "
+                  >未上传</span
+                >
+              </template>
+            </ws-form-item>
+            <!--装车日期-->
+            <el-form-item label="装车日期:" span="1" prop="sendDateStart" >
+            <ws-date-picker
+              v-model="item.sendDateStart"
+              type="date"
+              style="width: 150px;"
+              placeholder="请选择日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
+
+          <!-- 提交 -->
+    <div style="text-align: right; padding: 10px" class="center">
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="submit(deptBudgetList)"
+        >提交</el-button
+      >
+    </div>
+
+            <div
+              v-show="
+                item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'
+              "
+              class="signStatus"
+            >
+              {{ item.signStatus }}
+            </div>
+            <div
+              v-show="
+                item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'
+              "
+              class="signStatus1"
+            >
+              {{ item.signStatus }}
+            </div>
+            <span
+              v-show="item.temporaryDriverFlag != 0"
+              width="22"
+              height="22"
+              class="del"
+              @click="del(index)"
+              src="../../../public/img/del.png"
+              alt=""
+              >×</span
+            >
+          </ws-info-table>
+        </div>
+      </div>
+      <div style="text-align: right; color: #8890b1; font-size: 16px">
+        合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
+      </div>
+      <!-- <el-button class="add bg-bottom" type="primary" size="small" @click="add">
+        <img width="22" height="22" src="../../../public/img/add.png" alt="" />
+        <div class="spans">添加临时用车</div></el-button
+      > -->
+    </ws-form>
+    <!-- 提交 -->
+    <div style="text-align: right; padding: 10px" class="wanhuo">
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="submit(deptBudgetList)"
+        >完货</el-button
+      >
+    </div>
+  </div>
+</template>
+<script>
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import { seeCat, packList, feedback, getbank } from '@/model/transport/index'
+import { getstaff } from '@/model/warehouse/index'
+import WsUpload from '@/components/WsUpload'
+import mapDrag from '@/components/mapdrag/mapdrag'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    mapDrag,
+  },
+  watch: {
+    vesselId(val) {
+      this.getVesselData()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      deptBudgetList: {
+        totalStorage: 0,
+      },
+      options_: regionData,
+      heightData: '600px',
+      zoom: 7,
+      selectedOptions: [],
+      center: [116.244694, 39.517344],
+      window: '',
+      radio: 1,
+      personCharge: [],
+      district: null,
+      driverList: [],
+      readonly: true,
+      listDate: { country: '中国', level: 'country', city: '' },
+      citylist: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      rules: {
+        warehouseName: [
+          {
+            required: true,
+            message: '请输入仓库名称',
+            trigger: 'blur',
+          },
+          {
+            min: 2,
+            max: 20,
+            message: '仓库名长度不符合要求，请输入2-20字符之内',
+            trigger: 'blur',
+          },
+        ],
+      },
+      tranType: 1,
+      size: 10,
+      value1: '',
+      unitList: [],
+
+      freightspace1: [
+        {
+          accountTypeFlag: '1',
+          payeeName: '',
+          payeeNumberCard: '',
+          compName: '',
+          bankDeposit: '',
+          addressUrlArray: [],
+          bankCard: '',
+        },
+      ],
+      freightspace: [
+        {
+          boxNo: '',
+          loadNetWeight: '',
+          loadPoundImg: '',
+          loadingDate:'',
+        },
+        // {loadPoundImg:{}},
+      ],
+      name: '',
+      staffList: [],
+      options: [],
+      carModel: [],
+      tranCarInfoList: {
+        loadPoundImg: '',
+      },
+      //  tranCarList: {
+      //   driver: '',
+      //   driverPhone:'',
+      //   sendDateStart:'',
+      //   receiveDateEnd:'',
+      //   carModel:'',
+      // },
+      //上传
+      accessoryTFs: false,
+      fileList: [],
+      appendixIdsAdd: '',
+    }
+  },
+  activated() {
+    this.deptBudgetList.id = this.$route.query.id
+    this.getList()
+  },
+  computed: {
+    totalStorage: function () {
+      var maxStorage = 0
+      for (var i = 0; i < this.freightspace.length; i++) {
+        maxStorage += Number(this.freightspace[i].maxStorage)
+      }
+      return maxStorage
+    },
+    total: function () {
+      if (this.deptBudgetList.tranCarInfoList != null) {
+        var maxStorage = 0
+        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          maxStorage += Number(
+            this.deptBudgetList.tranCarInfoList[i].loadNetWeight
+          )
+        }
+        return maxStorage
+      } else {
+        return 0
+      }
+    },
+  },
+  methods: {
+    dataFilter(val) {
+      this.deptBudgetList.personCharge = val
+      if (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) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
+          this.freightspace[i].driverPhone = this.staffList[i].staffMobilePhone
+          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+        }
+      }
+    },
+    marker: function (item) {
+      this.deptBudgetList.warehousePositioning =
+        item.lnglat.lat + ',' + item.lnglat.lng
+    },
+    selectedAddress(e) {
+      this.deptBudgetList.warehousePositioning =
+        e.center.lat + ',' + e.center.lng
+    },
+    confirmPositioncity() {
+      this.listDate.level = 'city'
+      this.listDate.country = this.name
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    add() {
+      this.freightspace.push({
+        driver: '',
+        driverPhone: '',
+        carNo: '',
+        loadNetWeight: '',
+      })
+    },
+    del(index) {
+      if (this.freightspace.length > 1) {
+        this.freightspace.splice(index, 1)
+      }
+    },
+    //下拉司机姓名改变事件
+    selectdriver() {},
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    returnsales() {
+      this.deptBudgetList = {}
+      this.freightspace = {}
+      this.selectedOptions = ''
+      this.deptBudgetList.tranCarInfoList = []
+      this.$router.push({ path: 'tranManagementTransporHairRespond' })
+    },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    submit() {
+      for (var i = 0; i < this.freightspace.length; i++) {
+        if (this.freightspace[i].temporaryDriverFlag != 0) {
+          if (!this.freightspace[i].driver) {
+            this.$message({
+              message: '司机姓名不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.freightspace[i].driverPhone) {
+            this.$message({
+              message: '司机电话不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.freightspace[i].carNo) {
+            this.$message({
+              message: '车牌号不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.freightspace[i].loadNetWeight) {
+            this.$message({
+              message: '装载净重不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+        }
+      }
+      this.$confirm(`提交成功后提醒司机及时签订运输合同，确定提交装车信息？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              // this.deptBudgetList.totalStorage = this.totalStorage
+              this.tranCarInfoList = this.freightspace
+              this.tranCarInfoList.driver = this.deptBudgetList.driver
+              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+              this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
+              this.tranCarInfoList.carNo = this.deptBudgetList.carNo
+              this.tranCarInfoList.loadNetWeight =
+                this.deptBudgetList.loadNetWeight
+              this.tranCarInfoList.tranType = this.tranType
+              this.tranCarInfoList.loadPoundImg =
+                this.deptBudgetList.loadPoundImg
+              // this.tranCarInfoList.boxNo = this.arr.toString()
+              for (var i = 0; i < this.tranCarInfoList.length; i++) {
+                this.tranCarInfoList[i].id = this.freightspace[i].id
+                if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
+                  this.tranCarInfoList[i].temporaryDriverFlag = 1
+                  this.tranCarInfoList[i].tranType = this.tranType
+                }
+              }
+              var tranProcessInfo = {}
+              tranProcessInfo.id = this.deptBudgetList.id
+              tranProcessInfo.infoId = this.deptBudgetList.infoId
+              tranProcessInfo.processNo = this.deptBudgetList.processNo
+              tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
+              tranProcessInfo.tranCarInfoList = this.tranCarInfoList
+              // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
+              feedback(tranProcessInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('提交成功')
+                  this.deptBudgetList = {}
+                  this.freightspace = {}
+                  this.selectedOptions = ''
+                  this.$router.push({
+                    path: 'tranManagementTransporHairRespond',
+                  })
+                })
+            } else {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              return false
+            }
+          })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    resetForm(deptBudgetList) {
+      this.$refs[deptBudgetList].resetFields()
+    },
+    getList() {
+      seeCat({ id: this.deptBudgetList.id })
+        .toPromise()
+        .then((response) => {
+          this.deptBudgetList = response
+          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+          this.freightspace = response.tranCarInfoList
+          for (var i = 0; i < this.freightspace.length; i++) {
+            if (!this.freightspace[i].loadNetWeight) {
+              this.freightspace[i].loadNetWeight = 0
+            }
+          }
+        })
+      //司机姓名下拉
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+        .toPromise()
+        .then((response) => {
+          this.options = response
+          this.staffList = response
+        })
+      //车型
+      packList({ constId: 'TRAN5' })
+        .toPromise()
+        .then((response) => {
+          this.carModel = response
+        })
+    },
+    handleExamine() {},
+    approve() {},
+    // returnsales() {
+    //   this.$router.push({ path: 'purchaseContract' })
+    // },
+    selectChapterTwo(e) {
+      for (var i = 0; i < this.ChapterTwoList.length; i++) {
+        if (this.ChapterTwoList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
+        }
+      }
+    },
+    selectunitList(e) {
+      for (var i = 0; i < this.unitList.length; i++) {
+        if (this.unitList[i].constValue == e) {
+          this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
+        }
+      }
+    },
+    selectgrade(e) {
+      for (var i = 0; i < this.gradeList.length; i++) {
+        if (this.gradeList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+        }
+      }
+    },
+    selectgoodsName(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
+    selectpackingMethod(e) {
+      for (var i = 0; i < this.packtypeList.length; i++) {
+        if (this.packtypeList[i].constValue == e) {
+          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+        }
+      }
+    },
+    uploadSuccessHandle1(e, index) {
+      this.freightspace[index].loadPoundImg = e.url
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+/deep/.totalStorage .el-input__inner {
+  color: #afb5cb;
+  background: #f5f7fa;
+}
+.small-title {
+  position: relative;
+  padding: 10px;
+  font-weight: 600;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+}
+.position {
+  position: relative;
+}
+
+.del {
+  position: absolute;
+  right: -38px;
+  top: 14px;
+  cursor: pointer;
+  right: 0;
+  display: inline-block;
+  font-size: 26px;
+  width: 26px;
+  height: 10px;
+  line-height: 0px;
+}
+
+.amap-page-container {
+  width: 300px;
+  height: 300px;
+}
+.el-form {
+  padding: 0 15%;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid transparent;
+  background: #fff;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 100px;
+  text-align: center;
+  background: #fff;
+  // border: 1px solid #cdd2dc;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 15px 0px;
+}
+.wenzi {
+  width: 900px;
+  margin: 0 auto;
+}
+.wenzi h3 {
+  display: inline-block;
+  left: 10px;
+}
+.wenzi p {
+  display: inline-block;
+}
+.center {
+    width: 900px;
+    margin: -70px auto;
+    margin-right: 38px;
+}
+.wanhuo {
+  width: 900px;
+  margin: 0 auto;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.ce {
+  width: 900px;
+  margin: 0 auto;
+}
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  // .is-disabled {
+  //   .el-input__inner:hover {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+  //   color: #606266;
+  //   .el-input__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //     color: #606266;
+  //   }
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //     color: #606266;
+  //   }
+  // }
+}
+
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+// /deep/.is-disabled {
+//   .el-input__prefix,
+//   .el-input__suffix {
+//     display: none;
+//   }
+//   .el-input__inner {
+//     background-color: #fff;
+//     border-color: #fff !important;
+//     color: #000 !important;
+//     font-size: 14px;
+//     cursor: text;
+//     padding: 0 !important;
+//   }
+// }
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.ws-info-table .el-form-item {
+  width: 33.3333%;
+}
+.readonly:after {
+  display: none;
+}
+.el-textarea__inner {
+  display: none;
+}
+.el-form {
+  margin-top: 50px;
+}
+.readonly {
+  width: 16%;
+}
+
+//去边框
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+/deep/.ws-info-table .el-form-item {
+  border: none;
+  height: 50px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  font-family: PingFangSC-Regular, PingFang SC;
+  margin-bottom: 5px;
+  background-color: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background-color: #fff;
+  font-size: 13px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+}
+/deep/.flex .ws-info-table .el-form-item .el-form-item__content {
+  border: 0px;
+}
+.catNos {
+    width: 5%;
+    height: 30px;
+    margin-top: 10px;
+    margin-left: 20px;
+    margin-right: -5px;
+    font-size: 14px;
+}
+.catNosCor {
+  color: #5473e8;
+}
+.add {
+  width: 130px;
+  height: 34px;
+  background: #f6f7fb;
+  border-radius: 17px;
+  color: #5473e8;
+  font-size: 14px;
+  border: none;
+}
+.add img {
+  display: inline-block;
+  margin-top: 3px;
+  margin-left: -30px;
+}
+.add .spans {
+  display: table-caption;
+  width: 56px;
+  height: 20px;
+  line-height: 18px;
+}
+.signStatus {
+  height: 25px;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  color: #ffffff;
+  background: #c4cada;
+  line-height: 24px;
+  margin-left: 18px;
+}
+.signStatus1 {
+  height: 25px;
+  background: #e6ebff;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 18px;
+  color: #5473e8;
+  line-height: 24px;
+}
+.line {
+  height: 26px;
+  margin-top: 6px;
+  left: 2px;
+}
+//装车详情
+/deep/.liaison .ws-info-table .el-form-item {
+  width: 20%;
+}
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
+  width: 50%;
+  background: #f6f7fc;
+}
+/deep/.liaison .flex {
+  display: contents;
+}
+/deep/.liaison .ws-info-table {
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
+}
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
+  padding: 0px;
+}
+
+//联络员及车次
+/deep/.lianluoyuan .ws-info-table .el-form-item {
+  width: 20%;
+}
+/deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__label {
+  width: 50%;
+  background: #f6f7fc;
+  padding-right: 28px;
+  margin-top: 5px;
+}
+/deep/.lianluoyuan .flex {
+  display: contents;
+}
+/deep/.lianluoyuan .ws-info-table {
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
+}
+/deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__content {
+  padding: 0px;
+  margin-top: 5px;
+}
+</style>

src/views/tranManagement/tranManagementFireFeedbackLook.vue

@@ -0,0 +1,883 @@
+//装车反馈查看
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left title">查看火运装车反馈</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <ws-form
+      class="position"
+      ref="deptBudgetList"
+      :rules="rules"
+      :model="deptBudgetList"
+    >
+      <div class="small-title" style="font-size: 16px">任务详情</div>
+      <ws-info-table>
+        <!--任务编号-->
+        <ws-form-item label="任务编号" span="1" prop="processNo">
+          {{ deptBudgetList.processNo }}
+        </ws-form-item>
+        <!--货名-->
+        <ws-form-item label="货名" span="1" prop="goodsName">
+          {{ deptBudgetList.goodsName }}
+        </ws-form-item>
+        <!--重量（吨）-->
+        <ws-form-item label="重量（吨）" span="1" prop="weight">
+          {{ deptBudgetList.weight }}
+        </ws-form-item>
+        <!--发货地址-->
+        <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
+          {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
+          }}{{ deptBudgetList.sendArea }}
+        </ws-form-item>
+        <!--发货人-->
+        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
+          {{ deptBudgetList.sender }}
+        </ws-form-item>
+        <!--发货人电话-->
+        <ws-form-item
+          label="发货人电话"
+          span="1"
+          prop="senderPhone"
+          class="readonly"
+        >
+          {{ deptBudgetList.senderPhone }}
+        </ws-form-item>
+        <!--收货地址-->
+        <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
+          {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
+          }}{{ deptBudgetList.receiveArea }}
+        </ws-form-item>
+        <!--收货人-->
+        <ws-form-item label="收货人" span="1" prop="receiver">
+          {{ deptBudgetList.receiver }}
+        </ws-form-item>
+        <!--收货人电话-->
+        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
+          {{ deptBudgetList.receiverPhone }}
+        </ws-form-item>
+        <!--发货日期-->
+        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
+          {{ deptBudgetList.deliveryDateStart }}
+        </ws-form-item>
+        <!--最晚到货日期-->
+        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
+          {{ deptBudgetList.deliveryDateEnd }}
+        </ws-form-item>
+        <!--合同编号-->
+        <ws-form-item label="合同编号" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+        <!-- 运输方式 -->
+        <ws-form-item label="运输方式" span="1" prop="tranType">
+          {{ deptBudgetList.tranType }}
+        </ws-form-item>
+      </ws-info-table>
+        <div class="small-title" style="font-size: 16px">联络员及车次</div>
+      <div class="lianluoyuan">
+        <ws-info-table>
+          <!--姓名-->
+          <ws-form-item label="姓名:" span="1" prop="driver">
+            <span>{{ deptBudgetList.driver }}</span>
+          </ws-form-item>
+          <!--电话-->
+          <ws-form-item label="电话:" span="1" prop="driverPhone">
+            <span>{{ deptBudgetList.driverPhone }}</span>
+          </ws-form-item>
+          <!--发车日期-->
+          <el-form-item label="发车日期:" span="1" prop="sendDateStart">
+            <ws-date-picker
+              v-model="deptBudgetList.sendDateStart"
+              type="date"
+              style="width: 150px"
+              placeholder="请选择日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
+          <!--预计到站日期-->
+          <ws-form-item label="预计到站日期:" span="1" prop="receiveDateEnd">
+            <span>{{ deptBudgetList.receiveDateEnd }}</span>
+          </ws-form-item>
+          <!--车型-->
+          <ws-form-item label="车型:" span="1" prop="caeModel">
+            <span>{{ deptBudgetList.carModel }}</span>
+          </ws-form-item>
+        </ws-info-table>
+      </div>
+      <div class="small-title" style="font-size: 16px">装车详情</div>
+      <div class="liaison">
+        <div
+          style="width: 100%"
+          class="flex position"
+          v-for="(item, index) in this.freightspace"
+          :key="index"
+        >
+          <ws-info-table>
+            <!--车厢号-->
+            <div class="catNos">
+             车厢号-{{ index + 1 }}
+            </div>
+            <ws-form-item label="车厢号:" span="1" prop="boxNo">
+              <span>{{ item.boxNo }}</span>
+            </ws-form-item>
+            <!--装车(吨)-->
+            <ws-form-item label="装车净重(吨):" span="1" prop="loadNetWeight">
+              {{ item.loadNetWeight }}
+            </ws-form-item>
+            <!--磅单-->
+            <ws-form-item label="磅单:" span="1" prop="loadPoundImg">
+              <template>
+                <img
+                  width="18"
+                  height="20"
+                  style="
+                    vertical-align: text-top;
+                    position: relative;
+                    top: -1px;
+                  "
+                  src="../../../public/img/fujian.png"
+                  @click="fujian(index)"
+                  alt=""
+                />
+
+                <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[index].loadPoundImgArr
+                      .length > 0
+                  "
+                  >{{
+                    deptBudgetList.tranCarInfoList[index].loadPoundImgArr.length
+                  }}</span
+                >
+                 <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[index].loadPoundImgArr
+                      .length == 0
+                  "
+                  >无</span>
+              </template>
+            </ws-form-item>
+             <!--装车日期-->
+            <ws-form-item label="装车日期:" span="1" prop="caseNo">
+             <span>{{ item.receiveDateEnd }}</span>
+            </ws-form-item>
+            <!-- <div
+            v-show="
+              item.temporaryDriverFlag == 0 &&
+              item.signStatus == '未签合同'
+            "
+            class="signStatus"
+          >
+            {{ item.signStatus }}
+          </div>
+          <div
+            v-show="
+              item.temporaryDriverFlag == 0 &&
+              item.signStatus == '已签合同'
+            "
+            class="signStatus1"
+          >
+            {{ item.signStatus }}
+          </div> -->
+          <!-- v-show="item.status == '未装车'" -->
+          <!-- v-show="item.status == '已装车'" -->
+          <!-- v-show="item.status == '已送达'" -->
+          <span class="noservice" >{{
+                  item.status
+                }} 未装车</span>
+          <!-- <span class="service" >{{
+                  item.status
+                }}已装车</span>
+          <span class="serviced" >{{
+                  item.status
+                }}已送达</span> -->
+          </ws-info-table>
+        </div>
+      </div>
+      <div style="text-align: center; color: #8890b1; font-size: 16px">
+        合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
+        <!--阶段状态-->
+         <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
+          未完货
+        </span>
+        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
+          deptBudgetList.feedbackStatus
+        }}</span>
+      </div>
+    </ws-form>
+    <!-- 关闭 -->
+    <div style="text-align: right; padding: 10px" class="center">
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="returnsales()"
+        >关闭</el-button
+      >
+    </div>
+    <!-- 附件弹框 -->
+    <WinseaContentModal
+      v-model="accessoryTFs"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose"
+    >
+      <p>查看附件</p>
+      <div
+        style="display: inline-block; margin: 5px"
+        v-for="item in appendixIdss"
+      >
+        <img width="100" height="100" :src="item" alt="" />
+      </div>
+    </WinseaContentModal>
+    <WinseaContentModal
+      v-model="accesscard"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose1"
+    >
+      <p>查看附件</p>
+      <img width="100" height="100" :src="accessurl" alt="" />
+    </WinseaContentModal>
+  </div>
+</template>
+<script>
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import { seeCat, packList, feedback } from '@/model/transport/index'
+import WsUpload from '@/components/WsUpload'
+import mapDrag from '@/components/mapdrag/mapdrag'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    mapDrag,
+  },
+  watch: {
+    vesselId(val) {
+      this.getVesselData()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      deptBudgetList: {
+        totalStorage: 0,
+      },
+      options_: regionData,
+      heightData: '600px',
+      zoom: 7,
+      selectedOptions: [],
+      center: [116.244694, 39.517344],
+      window: '',
+      radio: 1,
+      personCharge: [],
+      district: null,
+      driverList: [],
+      listDate: { country: '中国', level: 'country', city: '' },
+      citylist: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      rules: {
+        warehouseName: [
+          {
+            required: true,
+            message: '请输入仓库名称',
+            trigger: 'blur',
+          },
+          {
+            min: 2,
+            max: 20,
+            message: '仓库名长度不符合要求，请输入2-20字符之内',
+            trigger: 'blur',
+          },
+        ],
+      },
+      tranType: 1,
+      size: 10,
+      value1: '',
+      unitList: [],
+      freightspace: [
+        {
+          driver: '',
+          driverPhone: '',
+          carNo: '',
+          loadNetWeight: '',
+        },
+      ],
+      name: '',
+      staffList: [],
+      options: [],
+      // carModel: [],
+      tranCarInfoList: {},
+      //上传
+      accessoryTFs: false,
+      accesscard: false,
+      accessurl: '',
+      fileList: [],
+      // appendixIdsAdd: '',
+      //附件
+      appendixIdss: [],
+    }
+  },
+  mounted() {
+    this.deptBudgetList.id = this.$route.query.id
+    this.getList()
+  },
+
+  computed: {
+    totalStorage: function () {
+      var maxStorage = 0
+      for (var i = 0; i < this.freightspace.length; i++) {
+        maxStorage += Number(this.freightspace[i].maxStorage)
+      }
+      return maxStorage
+    },
+    total: function () {
+      if (this.deptBudgetList.tranCarInfoList != null) {
+        var maxStorage = 0
+        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          maxStorage += Number(
+            this.deptBudgetList.tranCarInfoList[i].loadNetWeight
+          )
+        }
+        return maxStorage
+      } else {
+        return 0
+      }
+    },
+    label1: function () {
+      //  for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+      //   if (this.deptBudgetList.tranCarInfoList[i].temporaryDriverFlag == 0) {
+      //     return '司机名称'
+      //   }
+      //   else if (this.deptBudgetList.tranCarInfoList[i].temporaryDriverFlag == 1) {
+      //     // alert(this.deptBudgetList.tranCarInfoList[i].temporaryDriverFlag)
+      //     return '司机名称（临）'
+      //   }
+      //  }
+      return '(临)'
+
+      // item.temporaryDriverFlag == 0
+    },
+  },
+  methods: {
+    marker: function (item) {
+      this.deptBudgetList.warehousePositioning =
+        item.lnglat.lat + ',' + item.lnglat.lng
+    },
+    selectedAddress(e) {
+      this.deptBudgetList.warehousePositioning =
+        e.center.lat + ',' + e.center.lng
+    },
+    confirmPositioncity() {
+      this.listDate.level = 'city'
+      this.listDate.country = this.name
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    handleClose1() {
+      this.accesscard = false
+    },
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    returnsales() {
+      this.deptBudgetList = {}
+      this.freightspace = {}
+      this.selectedOptions = ''
+      this.$router.push({ path: 'tranManagementTransporHairRespond' })
+    },
+    // confirmPosition() {
+    //   this.draggable = false
+    // },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    resetForm(deptBudgetList) {
+      this.$refs[deptBudgetList].resetFields()
+    },
+    getList() {
+      seeCat({ id: this.deptBudgetList.id })
+        .toPromise()
+        .then((response) => {
+          this.deptBudgetList = response
+          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+          this.freightspace = response.tranCarInfoList
+          for (var i = 0; i < this.freightspace.length; i++) {
+            if (!this.freightspace[i].loadNetWeight) {
+              this.freightspace[i].loadNetWeight = 0
+            }
+            if (this.deptBudgetList.tranCarInfoList[i].loadPoundImg != null) {
+              this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr =
+                this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
+              this.fileList[i] =
+                this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
+            } else {
+              this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr = []
+            }
+          }
+        })
+    },
+    selectChapterTwo(e) {
+      for (var i = 0; i < this.ChapterTwoList.length; i++) {
+        if (this.ChapterTwoList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
+        }
+      }
+    },
+    selectunitList(e) {
+      for (var i = 0; i < this.unitList.length; i++) {
+        if (this.unitList[i].constValue == e) {
+          this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
+        }
+      }
+    },
+    selectgrade(e) {
+      for (var i = 0; i < this.gradeList.length; i++) {
+        if (this.gradeList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+        }
+      }
+    },
+    selectgoodsName(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
+    selectpackingMethod(e) {
+      for (var i = 0; i < this.packtypeList.length; i++) {
+        if (this.packtypeList[i].constValue == e) {
+          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+        }
+      }
+    },
+    //上传
+    fujian(index) {
+      if (
+        this.deptBudgetList.tranCarInfoList[index].loadPoundImg === null ||
+        this.deptBudgetList.tranCarInfoList[index].loadPoundImg === ''
+      ) {
+        this.$message({
+          message: '暂无附件！',
+          type: 'warning',
+        })
+        return
+      } else {
+        this.accessoryTFs = true
+      }
+      this.appendixIdss =
+        this.deptBudgetList.tranCarInfoList[index].loadPoundImgArr
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+/deep/.totalStorage .el-input__inner {
+  color: #afb5cb;
+  background: #f5f7fa;
+}
+.small-title {
+  position: relative;
+  padding: 10px;
+  font-weight: 600;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+}
+.position {
+  position: relative;
+}
+.amap-page-container {
+  width: 300px;
+  height: 300px;
+}
+.el-form {
+  padding: 0 15%;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid transparent;
+  background: #fff;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 100px;
+  text-align: center;
+  background: #fff;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 15px 0px;
+}
+.wenzi {
+  width: 900px;
+  margin: 0 auto;
+}
+.wenzi h3 {
+  display: inline-block;
+  left: 10px;
+}
+.wenzi p {
+  display: inline-block;
+}
+.center {
+  margin-right: 50px;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.ce {
+  width: 900px;
+  margin: 0 auto;
+}
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  .is-disabled {
+    .el-input__inner:hover {
+      background-color: #fff !important;
+      border: 0;
+    }
+    color: #606266;
+    .el-input__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+  }
+}
+
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
+  }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
+  }
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.ws-info-table .el-form-item {
+  width: 33.3333%;
+}
+.readonly:after {
+  display: none;
+}
+.el-textarea__inner {
+  display: none;
+}
+.el-form {
+  margin-top: 50px;
+}
+.readonly {
+  width: 16%;
+}
+
+//去边框
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+/deep/.ws-info-table .el-form-item {
+  border: none;
+  height: 50px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  font-family: PingFangSC-Regular, PingFang SC;
+  margin-bottom: 5px;
+  background-color: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background-color: #fff;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+}
+/deep/.flex .ws-info-table .el-form-item .el-form-item__content {
+  border: 0px;
+  border-right: 1px solid #d8dce6;
+  border-radius: 0px;
+  padding: 0px;
+}
+//装车详情
+/deep/.liaison .ws-info-table .el-form-item {
+  width: 20%;
+}
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
+  width: 50%;
+  background: #f6f7fc;
+}
+/deep/.liaison .flex {
+  display: contents;
+}
+/deep/.liaison .ws-info-table {
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
+}
+.catNos {
+    width: 5%;
+    height: 30px;
+    margin-top: 10px;
+    margin-left: 20px;
+    margin-right: -5px;
+    font-size: 14px;
+}
+.catNosCor {
+  color: #5473e8;
+}
+.signStatus {
+  height: 25px;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 30px;
+  color: #ffffff;
+  background: #c4cada;
+  line-height: 24px;
+}
+.signStatus1 {
+  height: 25px;
+  background: #e6ebff;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 30px;
+  color: #5473e8;
+  line-height: 24px;
+}
+//联络员及车次
+/deep/.lianluoyuan .ws-info-table .el-form-item {
+  width: 20%;
+}
+/deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__label {
+  width: 50%;
+  background: #f6f7fc;
+  padding-right: 28px;
+  margin-top: 5px;
+}
+/deep/.lianluoyuan .flex {
+  display: contents;
+}
+/deep/.lianluoyuan .ws-info-table {
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
+}
+/deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__content {
+  padding: 0px;
+  margin-top: 5px;
+}
+//送达/未送达
+.noservice,
+.service {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+}
+.noservice {
+  background: #c4cada;
+  color: #ffffff;
+}
+.service {
+  background: #e5f1f7;
+  color: #50cad4;
+}
+</style>

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -0,0 +1,1048 @@
+//卸车反馈
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left title">火运卸车反馈</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+    <ws-form
+      class="position"
+      ref="deptBudgetList"
+      :rules="rules"
+      :model="deptBudgetList"
+    >
+      <div class="small-title" style="font-size: 16px">任务详情</div>
+      <ws-info-table>
+        <!--任务编号-->
+        <ws-form-item label="任务编号" span="1" prop="processNo">
+          {{ deptBudgetList.processNo }}
+        </ws-form-item>
+        <!--货名-->
+        <ws-form-item label="货名" span="1" prop="goodsName">
+          {{ deptBudgetList.goodsName }}
+        </ws-form-item>
+        <!--重量（吨）-->
+        <ws-form-item label="重量（吨）" span="1" prop="weight">
+          {{ deptBudgetList.weight }}
+        </ws-form-item>
+        <!--发货地址-->
+        <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
+          {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
+          }}{{ deptBudgetList.sendArea }}
+        </ws-form-item>
+        <!--发货人-->
+        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
+          {{ deptBudgetList.sender }}
+        </ws-form-item>
+        <!--发货人电话-->
+        <ws-form-item
+          label="发货人电话"
+          span="1"
+          prop="senderPhone"
+          class="readonly"
+        >
+          {{ deptBudgetList.senderPhone }}
+        </ws-form-item>
+        <!--收货地址-->
+        <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
+          {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
+          }}{{ deptBudgetList.receiveArea }}
+        </ws-form-item>
+        <!--收货人-->
+        <ws-form-item label="收货人" span="1" prop="receiver">
+          {{ deptBudgetList.receiver }}
+        </ws-form-item>
+        <!--收货人电话-->
+        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
+          {{ deptBudgetList.receiverPhone }}
+        </ws-form-item>
+        <!--发货日期-->
+        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
+          {{ deptBudgetList.deliveryDateStart }}
+        </ws-form-item>
+        <!--最晚到货日期-->
+        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
+          {{ deptBudgetList.deliveryDateEnd }}
+        </ws-form-item>
+        <!--合同编号-->
+        <ws-form-item label="合同编号" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+        <!-- 运输方式 -->
+        <ws-form-item label="运输方式" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+      </ws-info-table>
+      <div class="small-title" style="font-size: 16px">联络员及车次</div>
+      <div class="lianluoyuan">
+        <div
+          style="width: 100%"
+          class="flex position"
+          v-for="(item, index) in this.freightspace"
+          :key="index"
+        >
+        <ws-info-table>
+          <!--姓名-->
+          <ws-form-item label="姓名:" span="1" prop="driver">
+            <span>{{ item.driver }}</span>
+          </ws-form-item>
+          <!--电话-->
+          <ws-form-item label="电话:" span="1" prop="driverPhone">
+            <span>{{ item.driverPhone }}</span>
+          </ws-form-item>
+          <!--发车日期-->
+          <el-form-item label="发车日期:" span="1" prop="sendDateStart">
+            <ws-date-picker
+              v-model="item.sendDateStart"
+              type="date"
+              style="width: 150px"
+              placeholder="请选择日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
+          <!--到站日期-->
+          <ws-form-item label="到站日期:" span="1" prop="receiveDateEnd">
+            <span>{{ item.receiveDateEnd }}</span>
+          </ws-form-item>
+          <!--车型-->
+          <ws-form-item label="车型:" span="1" prop="caeModel">
+            <span>{{ item.carModel }}</span>
+          </ws-form-item>
+        </ws-info-table>
+      </div>
+      </div>
+      <div class="small-title" style="font-size: 16px">卸车详情</div>
+      <div class="liaison">
+        <div
+          style="width: 100%"
+          class="flex position"
+          v-for="(item, index) in this.freightspace"
+          :key="index"
+        >
+          <ws-info-table>
+            <!--车厢号-->
+            <div class="catNos">
+             车厢号-{{ index + 1 }}
+            </div>
+            <ws-form-item label="车厢号:" span="1" prop="boxNo">
+              <span>{{ item.boxNo }}</span>
+            </ws-form-item>
+            <!--卸车净重-->
+            <ws-form-item label="卸车净重：" span="1" prop="loadNetWeight">
+              <ws-input
+                v-if="item.status == '已卸车' || item.status == '已送达'"
+                :disabled="readonly"
+                v-model="item.loadNetWeight"
+                placeholder="请输入卸车净重"
+                maxlength="20"
+                size="small"
+              />
+              <ws-input
+                v-else
+                v-model="item.loadNetWeight"
+                placeholder="请输入卸车净重"
+                maxlength="20"
+                size="small"
+              />
+            </ws-form-item>
+            <!--磅单-->
+            <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
+              <!-- slot-scope="scope" -->
+              <template>
+                <el-upload
+                  action="https://www.zthymaoyi.com/upload/admin"
+                  :show-file-list="false"
+                  :on-success="
+                    (res) => {
+                      uploadSuccessHandle1(res, index)
+                    }
+                  "
+                  class="avatar-uploader"
+                  accept=".jpg, .jpeg, .png, .gif"
+                  ><img
+                    width="18"
+                    height="20"
+                    style="vertical-align: text-top; position: relative"
+                    src="../../../public/img/fujian.png"
+                    alt=""
+                  />
+                </el-upload>
+                <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[index].loadPoundImg != null
+                  "
+                  >1</span
+                >
+                <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[index].loadPoundImg == null
+                  "
+                  >未上传</span
+                >
+              </template>
+            </ws-form-item>
+            <!--卸车日期-->
+            <el-form-item label="卸车日期:" span="1" prop="sendDateStart" >
+            <ws-date-picker
+              v-model="item.sendDateStart"
+              type="date"
+              style="width: 150px;"
+              placeholder="请选择日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
+
+          <!-- 提交 -->
+    <div style="text-align: right; padding: 10px" class="center">
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="submit(deptBudgetList)"
+        >提交</el-button
+      >
+    </div>
+
+            <div
+              v-show="
+                item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'
+              "
+              class="signStatus"
+            >
+              {{ item.signStatus }}
+            </div>
+            <div
+              v-show="
+                item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'
+              "
+              class="signStatus1"
+            >
+              {{ item.signStatus }}
+            </div>
+            <span
+              v-show="item.temporaryDriverFlag != 0"
+              width="22"
+              height="22"
+              class="del"
+              @click="del(index)"
+              src="../../../public/img/del.png"
+              alt=""
+              >×</span
+            >
+          </ws-info-table>
+        </div>
+      </div>
+      <div style="text-align: right; color: #8890b1; font-size: 16px">
+        合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
+      </div>
+      <!-- <el-button class="add bg-bottom" type="primary" size="small" @click="add">
+        <img width="22" height="22" src="../../../public/img/add.png" alt="" />
+        <div class="spans">添加临时用车</div></el-button
+      > -->
+    </ws-form>
+    <!-- 提交 -->
+    <div style="text-align: right; padding: 10px" class="wanhuo">
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="submit(deptBudgetList)"
+        >完货</el-button
+      >
+    </div>
+  </div>
+</template>
+<script>
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import { seeCat, packList, feedback, getbank } from '@/model/transport/index'
+import { getstaff } from '@/model/warehouse/index'
+import WsUpload from '@/components/WsUpload'
+import mapDrag from '@/components/mapdrag/mapdrag'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    mapDrag,
+  },
+  watch: {
+    vesselId(val) {
+      this.getVesselData()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      deptBudgetList: {
+        totalStorage: 0,
+      },
+      options_: regionData,
+      heightData: '600px',
+      zoom: 7,
+      selectedOptions: [],
+      center: [116.244694, 39.517344],
+      window: '',
+      radio: 1,
+      personCharge: [],
+      district: null,
+      driverList: [],
+      readonly: true,
+      listDate: { country: '中国', level: 'country', city: '' },
+      citylist: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      rules: {
+        warehouseName: [
+          {
+            required: true,
+            message: '请输入仓库名称',
+            trigger: 'blur',
+          },
+          {
+            min: 2,
+            max: 20,
+            message: '仓库名长度不符合要求，请输入2-20字符之内',
+            trigger: 'blur',
+          },
+        ],
+      },
+      tranType: 1,
+      size: 10,
+      value1: '',
+      unitList: [],
+
+      freightspace1: [
+        {
+          accountTypeFlag: '1',
+          payeeName: '',
+          payeeNumberCard: '',
+          compName: '',
+          bankDeposit: '',
+          addressUrlArray: [],
+          bankCard: '',
+        },
+      ],
+      freightspace: [
+        {
+          boxNo: '',
+          loadNetWeight: '',
+          loadPoundImg: '',
+          loadingDate:'',
+        },
+        // {loadPoundImg:{}},
+      ],
+      name: '',
+      staffList: [],
+      options: [],
+      carModel: [],
+      tranCarInfoList: {
+        loadPoundImg: '',
+      },
+      //  tranCarList: {
+      //   driver: '',
+      //   driverPhone:'',
+      //   sendDateStart:'',
+      //   receiveDateEnd:'',
+      //   carModel:'',
+      // },
+      //上传
+      accessoryTFs: false,
+      fileList: [],
+      appendixIdsAdd: '',
+    }
+  },
+  activated() {
+    this.deptBudgetList.id = this.$route.query.id
+    this.getList()
+  },
+  computed: {
+    totalStorage: function () {
+      var maxStorage = 0
+      for (var i = 0; i < this.freightspace.length; i++) {
+        maxStorage += Number(this.freightspace[i].maxStorage)
+      }
+      return maxStorage
+    },
+    total: function () {
+      if (this.deptBudgetList.tranCarInfoList != null) {
+        var maxStorage = 0
+        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          maxStorage += Number(
+            this.deptBudgetList.tranCarInfoList[i].loadNetWeight
+          )
+        }
+        return maxStorage
+      } else {
+        return 0
+      }
+    },
+  },
+  methods: {
+    dataFilter(val) {
+      this.deptBudgetList.personCharge = val
+      if (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) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
+          this.freightspace[i].driverPhone = this.staffList[i].staffMobilePhone
+          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+        }
+      }
+    },
+    marker: function (item) {
+      this.deptBudgetList.warehousePositioning =
+        item.lnglat.lat + ',' + item.lnglat.lng
+    },
+    selectedAddress(e) {
+      this.deptBudgetList.warehousePositioning =
+        e.center.lat + ',' + e.center.lng
+    },
+    confirmPositioncity() {
+      this.listDate.level = 'city'
+      this.listDate.country = this.name
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    add() {
+      this.freightspace.push({
+        driver: '',
+        driverPhone: '',
+        carNo: '',
+        loadNetWeight: '',
+      })
+    },
+    del(index) {
+      if (this.freightspace.length > 1) {
+        this.freightspace.splice(index, 1)
+      }
+    },
+    //下拉司机姓名改变事件
+    selectdriver() {},
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    returnsales() {
+      this.deptBudgetList = {}
+      this.freightspace = {}
+      this.selectedOptions = ''
+      this.deptBudgetList.tranCarInfoList = []
+      this.$router.push({ path: 'tranManagementTransporHairRespond' })
+    },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    submit() {
+      for (var i = 0; i < this.freightspace.length; i++) {
+        if (this.freightspace[i].temporaryDriverFlag != 0) {
+          if (!this.freightspace[i].driver) {
+            this.$message({
+              message: '司机姓名不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.freightspace[i].driverPhone) {
+            this.$message({
+              message: '司机电话不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.freightspace[i].carNo) {
+            this.$message({
+              message: '车牌号不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (!this.freightspace[i].loadNetWeight) {
+            this.$message({
+              message: '装载净重不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+        }
+      }
+      this.$confirm(`提交成功后提醒司机及时签订运输合同，确定提交卸车信息？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              // this.deptBudgetList.totalStorage = this.totalStorage
+              this.tranCarInfoList = this.freightspace
+              this.tranCarInfoList.driver = this.deptBudgetList.driver
+              this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+              this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
+              this.tranCarInfoList.carNo = this.deptBudgetList.carNo
+              this.tranCarInfoList.loadNetWeight =
+                this.deptBudgetList.loadNetWeight
+              this.tranCarInfoList.tranType = this.tranType
+              this.tranCarInfoList.loadPoundImg =
+                this.deptBudgetList.loadPoundImg
+              // this.tranCarInfoList.boxNo = this.arr.toString()
+              for (var i = 0; i < this.tranCarInfoList.length; i++) {
+                this.tranCarInfoList[i].id = this.freightspace[i].id
+                if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
+                  this.tranCarInfoList[i].temporaryDriverFlag = 1
+                  this.tranCarInfoList[i].tranType = this.tranType
+                }
+              }
+              var tranProcessInfo = {}
+              tranProcessInfo.id = this.deptBudgetList.id
+              tranProcessInfo.infoId = this.deptBudgetList.infoId
+              tranProcessInfo.processNo = this.deptBudgetList.processNo
+              tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
+              tranProcessInfo.tranCarInfoList = this.tranCarInfoList
+              // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
+              feedback(tranProcessInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('提交成功')
+                  this.deptBudgetList = {}
+                  this.freightspace = {}
+                  this.selectedOptions = ''
+                  this.$router.push({
+                    path: 'tranManagementTransporHairRespond',
+                  })
+                })
+            } else {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              return false
+            }
+          })
+        })
+        .catch(() => {
+          return false
+        })
+    },
+    resetForm(deptBudgetList) {
+      this.$refs[deptBudgetList].resetFields()
+    },
+    getList() {
+      seeCat({ id: this.deptBudgetList.id })
+        .toPromise()
+        .then((response) => {
+          this.deptBudgetList = response
+          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+          this.freightspace = response.tranCarInfoList
+          for (var i = 0; i < this.freightspace.length; i++) {
+            if (!this.freightspace[i].loadNetWeight) {
+              this.freightspace[i].loadNetWeight = 0
+            }
+          }
+        })
+      //司机姓名下拉
+      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
+        .toPromise()
+        .then((response) => {
+          this.options = response
+          this.staffList = response
+        })
+      //车型
+      packList({ constId: 'TRAN5' })
+        .toPromise()
+        .then((response) => {
+          this.carModel = response
+        })
+    },
+    handleExamine() {},
+    approve() {},
+    // returnsales() {
+    //   this.$router.push({ path: 'purchaseContract' })
+    // },
+    selectChapterTwo(e) {
+      for (var i = 0; i < this.ChapterTwoList.length; i++) {
+        if (this.ChapterTwoList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
+        }
+      }
+    },
+    selectunitList(e) {
+      for (var i = 0; i < this.unitList.length; i++) {
+        if (this.unitList[i].constValue == e) {
+          this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
+        }
+      }
+    },
+    selectgrade(e) {
+      for (var i = 0; i < this.gradeList.length; i++) {
+        if (this.gradeList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+        }
+      }
+    },
+    selectgoodsName(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
+    selectpackingMethod(e) {
+      for (var i = 0; i < this.packtypeList.length; i++) {
+        if (this.packtypeList[i].constValue == e) {
+          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+        }
+      }
+    },
+    uploadSuccessHandle1(e, index) {
+      this.freightspace[index].loadPoundImg = e.url
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+/deep/.totalStorage .el-input__inner {
+  color: #afb5cb;
+  background: #f5f7fa;
+}
+.small-title {
+  position: relative;
+  padding: 10px;
+  font-weight: 600;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+}
+.position {
+  position: relative;
+}
+
+.del {
+  position: absolute;
+  right: -38px;
+  top: 14px;
+  cursor: pointer;
+  right: 0;
+  display: inline-block;
+  font-size: 26px;
+  width: 26px;
+  height: 10px;
+  line-height: 0px;
+}
+
+.amap-page-container {
+  width: 300px;
+  height: 300px;
+}
+.el-form {
+  padding: 0 15%;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid transparent;
+  background: #fff;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 100px;
+  text-align: center;
+  background: #fff;
+  // border: 1px solid #cdd2dc;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 15px 0px;
+}
+.wenzi {
+  width: 900px;
+  margin: 0 auto;
+}
+.wenzi h3 {
+  display: inline-block;
+  left: 10px;
+}
+.wenzi p {
+  display: inline-block;
+}
+.center {
+    width: 900px;
+    margin: -60px auto;
+    margin-right: 38px;
+}
+.wanhuo {
+  width: 900px;
+  margin: 0 auto;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.ce {
+  width: 900px;
+  margin: 0 auto;
+}
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  // .is-disabled {
+  //   .el-input__inner:hover {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //   }
+  //   color: #606266;
+  //   .el-input__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //     color: #606266;
+  //   }
+  //   .el-textarea__inner {
+  //     background-color: #fff !important;
+  //     border: 0;
+  //     color: #606266;
+  //   }
+  // }
+}
+
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+// /deep/.is-disabled {
+//   .el-input__prefix,
+//   .el-input__suffix {
+//     display: none;
+//   }
+//   .el-input__inner {
+//     background-color: #fff;
+//     border-color: #fff !important;
+//     color: #000 !important;
+//     font-size: 14px;
+//     cursor: text;
+//     padding: 0 !important;
+//   }
+// }
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.ws-info-table .el-form-item {
+  width: 33.3333%;
+}
+.readonly:after {
+  display: none;
+}
+.el-textarea__inner {
+  display: none;
+}
+.el-form {
+  margin-top: 50px;
+}
+.readonly {
+  width: 16%;
+}
+
+//去边框
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+/deep/.ws-info-table .el-form-item {
+  border: none;
+  height: 50px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  font-family: PingFangSC-Regular, PingFang SC;
+  margin-bottom: 5px;
+  background-color: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background-color: #fff;
+  font-size: 13px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+}
+/deep/.flex .ws-info-table .el-form-item .el-form-item__content {
+  border: 0px;
+}
+.catNos {
+    width: 5%;
+    height: 30px;
+    margin-top: 10px;
+    margin-left: 20px;
+    margin-right: -5px;
+    font-size: 14px;
+}
+.catNosCor {
+  color: #5473e8;
+}
+.add {
+  width: 130px;
+  height: 34px;
+  background: #f6f7fb;
+  border-radius: 17px;
+  color: #5473e8;
+  font-size: 14px;
+  border: none;
+}
+.add img {
+  display: inline-block;
+  margin-top: 3px;
+  margin-left: -30px;
+}
+.add .spans {
+  display: table-caption;
+  width: 56px;
+  height: 20px;
+  line-height: 18px;
+}
+.signStatus {
+  height: 25px;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  color: #ffffff;
+  background: #c4cada;
+  line-height: 24px;
+  margin-left: 18px;
+}
+.signStatus1 {
+  height: 25px;
+  background: #e6ebff;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 18px;
+  color: #5473e8;
+  line-height: 24px;
+}
+.line {
+  height: 26px;
+  margin-top: 6px;
+  left: 2px;
+}
+//卸车详情
+/deep/.liaison .ws-info-table .el-form-item {
+  width: 20%;
+}
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
+  width: 50%;
+  background: #f6f7fc;
+}
+/deep/.liaison .flex {
+  display: contents;
+}
+/deep/.liaison .ws-info-table {
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
+}
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
+  padding: 0px;
+}
+
+//联络员及车次
+/deep/.lianluoyuan .ws-info-table .el-form-item {
+  width: 20%;
+}
+/deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__label {
+  width: 50%;
+  background: #f6f7fc;
+  padding-right: 28px;
+  margin-top: 5px;
+}
+/deep/.lianluoyuan .flex {
+  display: contents;
+}
+/deep/.lianluoyuan .ws-info-table {
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
+}
+/deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__content {
+  padding: 0px;
+  margin-top: 5px;
+}
+</style>

src/views/tranManagement/tranManagementFireReceivingFeedbackLook.vue

@@ -0,0 +1,883 @@
+//卸车反馈查看
+<template>
+  <div class="container">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left title">查看火运卸车反馈</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button
+          class="bg-bottom"
+          type="primary"
+          size="small"
+          @click="returnsales()"
+          ><img
+            width="6"
+            height="10"
+            style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png"
+            alt=""
+          />返回</el-button
+        >
+      </el-col>
+    </el-row>
+
+    <ws-form
+      class="position"
+      ref="deptBudgetList"
+      :rules="rules"
+      :model="deptBudgetList"
+    >
+      <div class="small-title" style="font-size: 16px">任务详情</div>
+      <ws-info-table>
+        <!--任务编号-->
+        <ws-form-item label="任务编号" span="1" prop="processNo">
+          {{ deptBudgetList.processNo }}
+        </ws-form-item>
+        <!--货名-->
+        <ws-form-item label="货名" span="1" prop="goodsName">
+          {{ deptBudgetList.goodsName }}
+        </ws-form-item>
+        <!--重量（吨）-->
+        <ws-form-item label="重量（吨）" span="1" prop="weight">
+          {{ deptBudgetList.weight }}
+        </ws-form-item>
+        <!--发货地址-->
+        <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
+          {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
+          }}{{ deptBudgetList.sendArea }}
+        </ws-form-item>
+        <!--发货人-->
+        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
+          {{ deptBudgetList.sender }}
+        </ws-form-item>
+        <!--发货人电话-->
+        <ws-form-item
+          label="发货人电话"
+          span="1"
+          prop="senderPhone"
+          class="readonly"
+        >
+          {{ deptBudgetList.senderPhone }}
+        </ws-form-item>
+        <!--收货地址-->
+        <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
+          {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
+          }}{{ deptBudgetList.receiveArea }}
+        </ws-form-item>
+        <!--收货人-->
+        <ws-form-item label="收货人" span="1" prop="receiver">
+          {{ deptBudgetList.receiver }}
+        </ws-form-item>
+        <!--收货人电话-->
+        <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
+          {{ deptBudgetList.receiverPhone }}
+        </ws-form-item>
+        <!--发货日期-->
+        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
+          {{ deptBudgetList.deliveryDateStart }}
+        </ws-form-item>
+        <!--最晚到货日期-->
+        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
+          {{ deptBudgetList.deliveryDateEnd }}
+        </ws-form-item>
+        <!--合同编号-->
+        <ws-form-item label="合同编号" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
+        <!-- 运输方式 -->
+        <ws-form-item label="运输方式" span="1" prop="tranType">
+          {{ deptBudgetList.tranType }}
+        </ws-form-item>
+      </ws-info-table>
+        <div class="small-title" style="font-size: 16px">联络员及车次</div>
+      <div class="lianluoyuan">
+        <ws-info-table>
+          <!--姓名-->
+          <ws-form-item label="姓名:" span="1" prop="driver">
+            <span>{{ deptBudgetList.driver }}</span>
+          </ws-form-item>
+          <!--电话-->
+          <ws-form-item label="电话:" span="1" prop="driverPhone">
+            <span>{{ deptBudgetList.driverPhone }}</span>
+          </ws-form-item>
+          <!--发车日期-->
+          <el-form-item label="发车日期:" span="1" prop="sendDateStart">
+            <ws-date-picker
+              v-model="deptBudgetList.sendDateStart"
+              type="date"
+              style="width: 150px"
+              placeholder="请选择日期"
+              value-format="yyyy-MM-dd"
+            />
+          </el-form-item>
+          <!--到站日期-->
+          <ws-form-item label="到站日期:" span="1" prop="receiveDateEnd">
+            <span>{{ deptBudgetList.receiveDateEnd }}</span>
+          </ws-form-item>
+          <!--车型-->
+          <ws-form-item label="车型:" span="1" prop="caeModel">
+            <span>{{ deptBudgetList.carModel }}</span>
+          </ws-form-item>
+        </ws-info-table>
+      </div>
+      <div class="small-title" style="font-size: 16px">卸车详情</div>
+      <div class="liaison">
+        <div
+          style="width: 100%"
+          class="flex position"
+          v-for="(item, index) in this.freightspace"
+          :key="index"
+        >
+          <ws-info-table>
+            <!--车厢号-->
+            <div class="catNos">
+             车厢号-{{ index + 1 }}
+            </div>
+            <ws-form-item label="车厢号:" span="1" prop="boxNo">
+              <span>{{ item.boxNo }}</span>
+            </ws-form-item>
+            <!--卸车(吨)-->
+            <ws-form-item label="卸车净重(吨):" span="1" prop="loadNetWeight">
+              {{ item.loadNetWeight }}
+            </ws-form-item>
+            <!--磅单-->
+            <ws-form-item label="磅单:" span="1" prop="loadPoundImg">
+              <template>
+                <img
+                  width="18"
+                  height="20"
+                  style="
+                    vertical-align: text-top;
+                    position: relative;
+                    top: -1px;
+                  "
+                  src="../../../public/img/fujian.png"
+                  @click="fujian(index)"
+                  alt=""
+                />
+
+                <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[index].loadPoundImgArr
+                      .length > 0
+                  "
+                  >{{
+                    deptBudgetList.tranCarInfoList[index].loadPoundImgArr.length
+                  }}</span
+                >
+                 <span
+                  v-if="
+                    deptBudgetList.tranCarInfoList[index].loadPoundImgArr
+                      .length == 0
+                  "
+                  >无</span>
+              </template>
+            </ws-form-item>
+             <!--卸车日期-->
+            <ws-form-item label="卸车日期:" span="1" prop="caseNo">
+             <span>{{ item.receiveDateEnd }}</span>
+            </ws-form-item>
+            <!-- <div
+            v-show="
+              item.temporaryDriverFlag == 0 &&
+              item.signStatus == '未签合同'
+            "
+            class="signStatus"
+          >
+            {{ item.signStatus }}
+          </div>
+          <div
+            v-show="
+              item.temporaryDriverFlag == 0 &&
+              item.signStatus == '已签合同'
+            "
+            class="signStatus1"
+          >
+            {{ item.signStatus }}
+          </div> -->
+          <!-- v-show="item.status == '未卸车'" -->
+          <!-- v-show="item.status == '已卸车'" -->
+          <!-- v-show="item.status == '已送达'" -->
+          <span class="noservice" >{{
+                  item.status
+                }} 未卸车</span>
+          <!-- <span class="service" >{{
+                  item.status
+                }}已卸车</span>
+          <span class="serviced" >{{
+                  item.status
+                }}已送达</span> -->
+          </ws-info-table>
+        </div>
+      </div>
+      <div style="text-align: center; color: #8890b1; font-size: 16px">
+        合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
+        <!--阶段状态-->
+         <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
+          未完货
+        </span>
+        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
+          deptBudgetList.feedbackStatus
+        }}</span>
+      </div>
+    </ws-form>
+    <!-- 关闭 -->
+    <div style="text-align: right; padding: 10px" class="center">
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="returnsales()"
+        >关闭</el-button
+      >
+    </div>
+    <!-- 附件弹框 -->
+    <WinseaContentModal
+      v-model="accessoryTFs"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose"
+    >
+      <p>查看附件</p>
+      <div
+        style="display: inline-block; margin: 5px"
+        v-for="item in appendixIdss"
+      >
+        <img width="100" height="100" :src="item" alt="" />
+      </div>
+    </WinseaContentModal>
+    <WinseaContentModal
+      v-model="accesscard"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose1"
+    >
+      <p>查看附件</p>
+      <img width="100" height="100" :src="accessurl" alt="" />
+    </WinseaContentModal>
+  </div>
+</template>
+<script>
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
+import { seeCat, packList, feedback } from '@/model/transport/index'
+import WsUpload from '@/components/WsUpload'
+import mapDrag from '@/components/mapdrag/mapdrag'
+export default {
+  name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+    mapDrag,
+  },
+  watch: {
+    vesselId(val) {
+      this.getVesselData()
+    },
+    isShow(val) {
+      this.showType = val
+    },
+  },
+  data() {
+    return {
+      deptBudgetList: {
+        totalStorage: 0,
+      },
+      options_: regionData,
+      heightData: '600px',
+      zoom: 7,
+      selectedOptions: [],
+      center: [116.244694, 39.517344],
+      window: '',
+      radio: 1,
+      personCharge: [],
+      district: null,
+      driverList: [],
+      listDate: { country: '中国', level: 'country', city: '' },
+      citylist: [],
+      compId: sessionStorage.getItem('ws-pf_compId'),
+      rules: {
+        warehouseName: [
+          {
+            required: true,
+            message: '请输入仓库名称',
+            trigger: 'blur',
+          },
+          {
+            min: 2,
+            max: 20,
+            message: '仓库名长度不符合要求，请输入2-20字符之内',
+            trigger: 'blur',
+          },
+        ],
+      },
+      tranType: 1,
+      size: 10,
+      value1: '',
+      unitList: [],
+      freightspace: [
+        {
+          driver: '',
+          driverPhone: '',
+          carNo: '',
+          loadNetWeight: '',
+        },
+      ],
+      name: '',
+      staffList: [],
+      options: [],
+      // carModel: [],
+      tranCarInfoList: {},
+      //上传
+      accessoryTFs: false,
+      accesscard: false,
+      accessurl: '',
+      fileList: [],
+      // appendixIdsAdd: '',
+      //附件
+      appendixIdss: [],
+    }
+  },
+  mounted() {
+    this.deptBudgetList.id = this.$route.query.id
+    this.getList()
+  },
+
+  computed: {
+    totalStorage: function () {
+      var maxStorage = 0
+      for (var i = 0; i < this.freightspace.length; i++) {
+        maxStorage += Number(this.freightspace[i].maxStorage)
+      }
+      return maxStorage
+    },
+    total: function () {
+      if (this.deptBudgetList.tranCarInfoList != null) {
+        var maxStorage = 0
+        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          maxStorage += Number(
+            this.deptBudgetList.tranCarInfoList[i].loadNetWeight
+          )
+        }
+        return maxStorage
+      } else {
+        return 0
+      }
+    },
+    label1: function () {
+      //  for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+      //   if (this.deptBudgetList.tranCarInfoList[i].temporaryDriverFlag == 0) {
+      //     return '司机名称'
+      //   }
+      //   else if (this.deptBudgetList.tranCarInfoList[i].temporaryDriverFlag == 1) {
+      //     // alert(this.deptBudgetList.tranCarInfoList[i].temporaryDriverFlag)
+      //     return '司机名称（临）'
+      //   }
+      //  }
+      return '(临)'
+
+      // item.temporaryDriverFlag == 0
+    },
+  },
+  methods: {
+    marker: function (item) {
+      this.deptBudgetList.warehousePositioning =
+        item.lnglat.lat + ',' + item.lnglat.lng
+    },
+    selectedAddress(e) {
+      this.deptBudgetList.warehousePositioning =
+        e.center.lat + ',' + e.center.lng
+    },
+    confirmPositioncity() {
+      this.listDate.level = 'city'
+      this.listDate.country = this.name
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleClose() {
+      this.dialogViewSpareMoney = false
+    },
+    handleClose1() {
+      this.accesscard = false
+    },
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    returnsales() {
+      this.deptBudgetList = {}
+      this.freightspace = {}
+      this.selectedOptions = ''
+      this.$router.push({ path: 'tranManagementTransporHairRespond' })
+    },
+    // confirmPosition() {
+    //   this.draggable = false
+    // },
+    // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+    },
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    resetForm(deptBudgetList) {
+      this.$refs[deptBudgetList].resetFields()
+    },
+    getList() {
+      seeCat({ id: this.deptBudgetList.id })
+        .toPromise()
+        .then((response) => {
+          this.deptBudgetList = response
+          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+          this.freightspace = response.tranCarInfoList
+          for (var i = 0; i < this.freightspace.length; i++) {
+            if (!this.freightspace[i].loadNetWeight) {
+              this.freightspace[i].loadNetWeight = 0
+            }
+            if (this.deptBudgetList.tranCarInfoList[i].loadPoundImg != null) {
+              this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr =
+                this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
+              this.fileList[i] =
+                this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
+            } else {
+              this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr = []
+            }
+          }
+        })
+    },
+    selectChapterTwo(e) {
+      for (var i = 0; i < this.ChapterTwoList.length; i++) {
+        if (this.ChapterTwoList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
+        }
+      }
+    },
+    selectunitList(e) {
+      for (var i = 0; i < this.unitList.length; i++) {
+        if (this.unitList[i].constValue == e) {
+          this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
+        }
+      }
+    },
+    selectgrade(e) {
+      for (var i = 0; i < this.gradeList.length; i++) {
+        if (this.gradeList[i].constValue == e) {
+          this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+        }
+      }
+    },
+    selectgoodsName(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
+    selectpackingMethod(e) {
+      for (var i = 0; i < this.packtypeList.length; i++) {
+        if (this.packtypeList[i].constValue == e) {
+          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+        }
+      }
+    },
+    //上传
+    fujian(index) {
+      if (
+        this.deptBudgetList.tranCarInfoList[index].loadPoundImg === null ||
+        this.deptBudgetList.tranCarInfoList[index].loadPoundImg === ''
+      ) {
+        this.$message({
+          message: '暂无附件！',
+          type: 'warning',
+        })
+        return
+      } else {
+        this.accessoryTFs = true
+      }
+      this.appendixIdss =
+        this.deptBudgetList.tranCarInfoList[index].loadPoundImgArr
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+/deep/.totalStorage .el-input__inner {
+  color: #afb5cb;
+  background: #f5f7fa;
+}
+.small-title {
+  position: relative;
+  padding: 10px;
+  font-weight: 600;
+}
+.small-title::before {
+  position: absolute;
+  content: '';
+  display: block;
+  background: #5473e8;
+  width: 4px;
+  height: 14px;
+  left: 0px;
+  top: 13px;
+}
+.position {
+  position: relative;
+}
+.amap-page-container {
+  width: 300px;
+  height: 300px;
+}
+.el-form {
+  padding: 0 15%;
+}
+/deep/.ws-info-table .el-form-item {
+  border-right: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+}
+.readonly {
+  position: relative;
+}
+.readonly:after {
+  content: '*';
+  color: #ff2727;
+  position: absolute;
+  right: 8px;
+  z-index: 10;
+  top: 21%;
+  font-size: 20px;
+}
+.title {
+  position: relative;
+}
+.title::before {
+  content: '';
+  display: inline-block;
+  width: 5px;
+  height: 30px;
+  background: #5473e8;
+  position: absolute;
+  left: 0;
+}
+.el-button--primary {
+  background-color: #5878e8;
+  border-color: #5878e8;
+}
+.el-col {
+  background: #f6f7fc;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  padding: 0 25px;
+  border-left: 1px solid transparent;
+  background: #fff;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  width: 100px;
+  text-align: center;
+  background: #fff;
+}
+.button-container {
+  display: flex;
+  flex-wrap: nowrap;
+  justify-content: space-between;
+  align-items: center;
+  background-color: #fff;
+  width: 100%;
+  height: 50px;
+  padding: 0 10px;
+  & > div {
+    margin-left: 10px;
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+    & > span {
+      line-height: 50px;
+    }
+  }
+
+  /deep/.auditFlow-box {
+    position: unset;
+    margin-left: 10px;
+    &/deep/.auditFlow-icon {
+      width: auto;
+      padding-right: 30px;
+    }
+    &/deep/.auditFlow-main {
+      position: absolute;
+    }
+  }
+}
+.box-app {
+  display: inline-block;
+  float: left;
+  margin-left: 30px;
+  line-height: 50px;
+}
+/deep/.el-dialog {
+  .el-form-item {
+    margin-bottom: 0 !important;
+    .el-input--medium {
+      textarea {
+        min-height: 100px !important;
+      }
+    }
+  }
+}
+.collapse-bottom {
+  margin-bottom: 20px;
+}
+.input-main .textarea .el-textarea__inner {
+  width: 100%;
+  z-index: 1;
+}
+.bg-left {
+  padding-left: 30px;
+}
+.bg-right {
+  padding-right: 10px;
+  text-align: right;
+}
+.bg-bottom {
+  margin: 15px 0px;
+}
+.wenzi {
+  width: 900px;
+  margin: 0 auto;
+}
+.wenzi h3 {
+  display: inline-block;
+  left: 10px;
+}
+.wenzi p {
+  display: inline-block;
+}
+.center {
+  margin-right: 50px;
+}
+.el-form-item {
+  width: 50%;
+}
+.el-form-item__label {
+  text-align: center;
+}
+.ce {
+  width: 900px;
+  margin: 0 auto;
+}
+/*.crt-main .textarea /deep/ .el-form-item__label {*/
+/*  height: 82px;*/
+/*}*/
+// 控制select为只读的时候显示样式
+
+.hide-sel {
+  .el-input__inner {
+    border: 0px;
+  }
+  .el-icon-arrow-up {
+    display: none;
+  }
+  .el-textarea__inner {
+    background-color: #fff !important;
+    border: 0;
+  }
+  .el-date-editor {
+    i {
+      display: none;
+    }
+  }
+  .is-disabled {
+    .el-input__inner:hover {
+      background-color: #fff !important;
+      border: 0;
+    }
+    color: #606266;
+    .el-input__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+      color: #606266;
+    }
+  }
+}
+
+// 控制select为只读的时候显示样式
+/deep/.ws-class-table-col {
+  height: auto;
+  padding: 0px 2px;
+  /deep/.el-input__inner {
+    padding: 0px 2px;
+  }
+}
+/deep/.is-disabled {
+  .el-input__prefix,
+  .el-input__suffix {
+    display: none;
+  }
+  .el-input__inner {
+    background-color: #fff;
+    border-color: #fff !important;
+    color: #000 !important;
+    font-size: 14px;
+    cursor: text;
+    padding: 0 !important;
+  }
+}
+.winseaview-view {
+  padding: 0 0 20px;
+}
+.container {
+  overflow: scroll;
+  height: 93vh;
+}
+.ws-info-table .el-form-item {
+  width: 33.3333%;
+}
+.readonly:after {
+  display: none;
+}
+.el-textarea__inner {
+  display: none;
+}
+.el-form {
+  margin-top: 50px;
+}
+.readonly {
+  width: 16%;
+}
+
+//去边框
+/deep/.el-form-item {
+  border-right: 0px;
+  border-bottom: 0px;
+}
+/deep/.ws-info-table {
+  border-left: 0px;
+  border-top: 0px;
+}
+.ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+}
+/deep/.ws-info-table .el-form-item {
+  border: none;
+  height: 50px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  font-family: PingFangSC-Regular, PingFang SC;
+  margin-bottom: 5px;
+  background-color: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+/deep/.ws-info-table .el-form-item .el-form-item__label {
+  background-color: #fff;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+}
+
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+}
+/deep/.flex .ws-info-table .el-form-item .el-form-item__content {
+  border: 0px;
+  border-right: 1px solid #d8dce6;
+  border-radius: 0px;
+  padding: 0px;
+}
+//卸车详情
+/deep/.liaison .ws-info-table .el-form-item {
+  width: 20%;
+}
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
+  width: 50%;
+  background: #f6f7fc;
+}
+/deep/.liaison .flex {
+  display: contents;
+}
+/deep/.liaison .ws-info-table {
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
+}
+.catNos {
+    width: 5%;
+    height: 30px;
+    margin-top: 10px;
+    margin-left: 20px;
+    margin-right: -5px;
+    font-size: 14px;
+}
+.catNosCor {
+  color: #5473e8;
+}
+.signStatus {
+  height: 25px;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 30px;
+  color: #ffffff;
+  background: #c4cada;
+  line-height: 24px;
+}
+.signStatus1 {
+  height: 25px;
+  background: #e6ebff;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 30px;
+  color: #5473e8;
+  line-height: 24px;
+}
+//联络员及车次
+/deep/.lianluoyuan .ws-info-table .el-form-item {
+  width: 20%;
+}
+/deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__label {
+  width: 50%;
+  background: #f6f7fc;
+  padding-right: 28px;
+  margin-top: 5px;
+}
+/deep/.lianluoyuan .flex {
+  display: contents;
+}
+/deep/.lianluoyuan .ws-info-table {
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
+}
+/deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__content {
+  padding: 0px;
+  margin-top: 5px;
+}
+//送达/未送达
+.noservice,
+.service {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+}
+.noservice {
+  background: #c4cada;
+  color: #ffffff;
+}
+.service {
+  background: #e5f1f7;
+  color: #50cad4;
+}
+</style>

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -107,18 +107,18 @@
               <template>
                 <span slot="reference">
                   <span
-                    v-if="scope.row.feedbackStatus == '待执行'"
+                    v-if="scope.row.receivingStatus == '待执行'"
                     class="executory"
                   ></span>
                   <span
-                    v-if="scope.row.feedbackStatus == '执行中'"
+                    v-if="scope.row.receivingStatus == '执行中'"
                     class="inExecution"
                   ></span>
                   <span
-                    v-if="scope.row.feedbackStatus == '已完成'"
+                    v-if="scope.row.receivingStatus == '已完货'"
                     class="done"
                   ></span
-                  >{{ scope.row.feedbackStatus }}
+                  >{{ scope.row.receivingStatus }}
                 </span>
               </template>
               <div>
@@ -154,25 +154,12 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <template
-              v-if="
-                scope.row.tranType == '汽运' &&
-                scope.row.feedbackStatus != '已完成'
-              "
-            >
+            <template v-if="scope.row.receivingStatus != '已完货'">
               <div class="record" @click="trainSee(scope.row)">查看</div>
               <div class="adjustment" @click="feedback(scope.row)">反馈</div>
             </template>
-            <template
-              v-else-if="
-                scope.row.tranType == '汽运' &&
-                scope.row.feedbackStatus == '已完成'
-              "
-            >
-              <div class="record1" @click="trainSee(scope.row)">查看</div>
-            </template>
             <template v-else>
-              <div class="record1">—— ——</div>
+              <div class="record1" @click="trainSee(scope.row)">查看</div>
             </template>
           </template>
         </el-table-column>
@@ -193,7 +180,7 @@
   </div>
 </template>
 <script>
-import { shippingList, state } from '@/model/transport/index'
+import { shippingList, stateRec } from '@/model/transport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -228,14 +215,14 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
-      feedbackFlag: 1,
+      feedbackFlag: 4,
       searchType: 1,
       searchTypeText: '执行中',
       searchKeyWord: '',
       contractType: 2,
       taskTypeList: [
-        { value: '执行中', type: 1 },
-        { value: '已完成', type: 2 },
+        { value: '执行中', type: 4 },
+        { value: '已完货', type: 5 },
         { value: '全部任务', type: 3 },
       ],
 
@@ -348,17 +335,49 @@ export default {
             id: row.id,
           },
         })
+      } else if (row.tranType == '船运') {
+        this.$router.push({
+          path: 'tranManagementUnShippingFeedbackLook',
+          query: {
+            id: row.id,
+          },
+        })
+      }
+      if (row.tranType == '火运') {
+        this.$router.push({
+          path: 'tranManagementFireReceivingFeedbackLook',
+          query: {
+            id: row.id,
+          },
+        })
       }
     },
 
     //反馈
     feedback(row) {
+      if (row.tranType == '汽运') {
       this.$router.push({
         path: 'tranManagementReceivingloading',
         query: {
           id: row.id,
         },
       })
+      }
+      if (row.tranType == '火运') {
+      this.$router.push({
+        path: 'tranManagementFireReceivingFeedback',
+        query: {
+          id: row.id,
+        },
+      })
+      } else if (row.tranType == '船运') {
+        this.$router.push({
+          path: 'tranManagementUnShippingFeedback',
+          query: {
+            id: row.id,
+          },
+        })
+      }
     },
     dateFormat(fmt, date) {
       let ret
@@ -397,10 +416,10 @@ export default {
     },
     editClick(row) {
       var status = ''
-      if (row.feedbackStatus == '待执行' || row.feedbackStatus == '已完成') {
+      if (row.receivingStatus == '待执行' || row.receivingStatus == '已完货') {
         status = '执行中'
-      } else if (row.feedbackStatus == '执行中') {
-        status = '已完成'
+      } else if (row.receivingStatus == '执行中') {
+        status = '已完货'
       }
       //cancelButtonClass: "btn-custom-cancel"
       this.$confirm(`是否将状态改为${status}`, {
@@ -409,7 +428,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          state({ id: row.id })
+          stateRec({ id: row.id })
             .toPromise()
             .then((response) => {
               this.$notify.success({
@@ -473,9 +492,9 @@ export default {
           this.startDate = ''
           this.endDate = ''
         }
-      }else{
+      } else {
         this.startDate = ''
-          this.endDate = ''
+        this.endDate = ''
       }
       this.currentPage = 1
       this.getList()

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -79,14 +79,34 @@
             <ws-form-item label="运输方式" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
           </ws-info-table>
 
-          <div class="small-title" style="font-size: 16px">卸车详情</div>
-
+          <div class="small-title" style="font-size: 16px;width: 50%;float: left;">卸车详情</div>
+          <!-- 导入 -->
+          <div style="font-size: 16px;width: 50%; margin-left: 1150px;">
+          <el-button
+            class="bg-bottom"
+            type="primary"
+            size="small"
+            @click="import(deptBudgetList)"
+            >导入</el-button
+          >
+        </div>
           <div
             class="driver position liaison"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
+            :key="index"
           >
             <ws-info-table>
-              <div class="catNos" v-show="item.temporaryDriverFlag == 0">司机-{{index+1}}</div>
+              <div class="catNos" v-show="item.temporaryDriverFlag == 0">司机-{{index+1}}
+                 <span class="noservice" v-show="item.status == '未装车'">{{
+                  item.status
+                }}</span>
+                <span class="service" v-show="item.status == '已装车'">
+                   未卸车
+                </span>
+                 <span class="serviced" v-show="item.status == '已送达'">
+                   已卸车
+                </span>
+              </div>
               <div class="catNos catNosCor" v-show="item.temporaryDriverFlag != 0">司机-{{index+1}}(临)</div>
               <!--姓名-->
               <ws-form-item
@@ -117,11 +137,11 @@
                 <span v-show="item.temporaryDriverFlag == 0">{{ item.carNo }}</span>
               </ws-form-item>
               <!--装车净重-->
-              <ws-form-item label="装车(吨)：" span="1" prop="loadNetWeight">{{item.loadNetWeight}}</ws-form-item>
+              <ws-form-item label="装车(吨)：" span="1" prop="loadNetWeight" style="width:150px">{{item.loadNetWeight}}</ws-form-item>
               <!--卸车净重(吨)-->
               <ws-form-item label="卸车净重(吨):" span="1" prop="unloadNetWeight">
                 <ws-input
-                  v-if="item.status == '已送达'" 
+                  v-if="item.status == '已送达'||item.status == '未装车'" 
                   v-model="item.unloadNetWeight"
                   placeholder="请输入卸车净重"
                   maxlength="20"
@@ -136,6 +156,23 @@
                   size="small"
                 />
               </ws-form-item>
+               <!--卸车日期-->
+            <ws-form-item label="卸车日期:" span="1" prop="receiveDateEnd"  style="width:275px">
+            <ws-date-picker
+              v-model="item.receiveDateEnd"
+              v-if="item.status == '已送达'||item.status == '未装车'" 
+              :disabled="readonly"
+              type="date"
+              value-format="yyyy-MM-dd"
+            />
+            <ws-date-picker
+              v-model="item.receiveDateEnd"
+              v-else
+              type="date"
+              placeholder="请选择日期"
+              value-format="yyyy-MM-dd"
+            />
+          </ws-form-item>
               <!--磅单-->
               <ws-form-item label="磅单：" span="1" prop="unloadPoundImg">
                 <template >
@@ -185,13 +222,27 @@
             </div>
             </ws-info-table>
           </div>
+        </div>
           <div
             style="text-align: right; color: #8890b1; font-size: 16px"
-          >合计{{ total }}/{{ deptBudgetList.weight }}</div>
+          >合计{{ total }}/{{ deptBudgetList.weight }}
+           <!--阶段状态-->
+         <span class="noservice" v-show="deptBudgetList.receivingStatus=='执行中'">
+          未完货
+        </span>
+        <span class="service" v-show="deptBudgetList.receivingStatus=='已完货'">{{
+          deptBudgetList.receivingStatus
+        }}</span></div>
           <div style="text-align: right; padding: 10px">
             <el-button class="bg-bottom-up" type="primary" size="small" @click="submit()">提交</el-button>
+             <el-button
+                class="bg-bottom"
+                type="primary"
+                size="small"
+                @click="finished (deptBudgetList)"
+                >完货</el-button
+              >
           </div>
-        </div>
       </ws-form>
     </div>
   </div>
@@ -199,7 +250,7 @@
 <script>
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { seeCat, packList, feedback, getbank } from '@/model/transport/index'
+import { seeCat, packList, feedback, getbank,stateRec } from '@/model/transport/index'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'
 export default {
@@ -362,7 +413,42 @@ export default {
           return false
         })
     },
+    //导入
+    import(){
+
+    },
+    finished(){
+       this.$confirm(`完货操作后，卸车信息不可修改，是否确定完货？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              var tranProcessInfo = {}
+              tranProcessInfo.id = this.deptBudgetList.id
+              stateRec(tranProcessInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('完货成功')
+                  this.deptBudgetList = {}
+                  this.freightspace = {}
+                  this.selectedOptions = ''
+                  this.$router.push({
+                    path: 'tranManagementReceivingFeedback',
+                  })
+                })
+            } else {
+              return false
+            }
+          })
+        })
+        .catch(() => {
+          return false
+        })
 
+    },
     handleClose() {
       this.accessoryTFs = false
     },

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -99,7 +99,17 @@
           
         >
           <ws-info-table>
-            <div class="catNos" v-show="item.temporaryDriverFlag == 0">司机-{{index+1}}</div>
+            <div class="catNos" v-show="item.temporaryDriverFlag == 0">司机-{{index+1}}
+              <span class="noservice" v-show="item.status == '未装车'">{{
+                  item.status
+                }}</span>
+                <span class="service" v-show="item.status == '已装车'">
+                  未卸车
+                </span>
+                 <span class="serviced" v-show="item.status == '已送达'">
+                  已卸车
+                </span>
+            </div>
              <div class="catNos catNosCor" v-show="item.temporaryDriverFlag != 0">司机-{{index+1}}(临)</div>
             <!--姓名-->
             <ws-form-item label="姓名:" span="1" prop="driver" v-show="freightspace[index].temporaryDriverFlag == 0">
@@ -128,7 +138,11 @@
             <ws-form-item label="卸车净重(吨):" span="1" prop="unloadNetWeight">
               {{ item.unloadNetWeight }}
             </ws-form-item>
-             <el-divider direction="vertical" class="line"></el-divider>
+            <el-divider direction="vertical" class="line"></el-divider>
+            <!--卸车日期-->
+            <el-form-item label="卸车日期:" span="1" prop="receiveDateEnd" >
+              {{ item.receiveDateEnd }}
+          </el-form-item>
             <!--磅单-->
             <ws-form-item label="磅单:" span="1" prop="unloadPoundImg">
               <template >
@@ -164,6 +178,7 @@
                 </div> -->
               </template>
             </ws-form-item>
+            <el-divider direction="vertical" class="line"></el-divider>
             <!--箱号-->
             <ws-form-item label="箱号:" span="1" prop="caseNo">
              <span>{{ item.caseNo }}</span>
@@ -184,6 +199,13 @@
       </div>
       <div style="text-align: right;color: #8890B1;font-size: 16px;">
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
+         <!--阶段状态-->
+         <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
+          未完货
+        </span>
+        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
+          deptBudgetList.feedbackStatus
+        }}</span>
       </div>
     </ws-form>
     <!-- 提交 -->
@@ -829,4 +851,21 @@ margin-top: 20px;
   color: #5473e8;
   line-height: 24px;
 }
+//送达/未送达
+.noservice,
+.service {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+}
+.noservice {
+  background: #c4cada;
+  color: #ffffff;
+}
+.service {
+  background: #e5f1f7;
+  color: #50cad4;
+}
 </style>

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -89,7 +89,17 @@
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
       </ws-info-table>
-      <div class="small-title" style="font-size: 16px">装车详情</div>
+      <div class="small-title" style="font-size: 16px; width: 50%;float: left;">装车详情</div>
+          <!-- 导入 -->
+      <div style="font-size: 16px; width: 50%;float: left;text-align: right;">
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="import(deptBudgetList)"
+        >导入</el-button
+      >
+    </div>
       <div class="liaison">
         <div
           style="width: 100%"
@@ -100,6 +110,15 @@
           <ws-info-table>
             <div class="catNos" v-show="item.temporaryDriverFlag == 0">
               司机-{{ index + 1 }}
+              <span class="noservice" v-show="item.status == '未装车'">{{
+                  item.status
+                }}</span>
+                <span class="service" v-show="item.status == '已装车'">{{
+                  item.status
+                }}</span>
+                 <span class="serviced" v-show="item.status == '已送达'">{{
+                  item.status
+                }}</span>
             </div>
             <div
               class="catNos catNosCor"
@@ -177,15 +196,37 @@
                 placeholder="请输入装车净重"
                 maxlength="20"
                 size="small"
+                style="width:80px"
               />
                <ws-input
                 v-else
                 v-model="item.loadNetWeight"
                 placeholder="请输入装车净重"
                 maxlength="20"
+                style="width:80px"
                 size="small"
               />
             </ws-form-item>
+            <!--装车日期-->
+            <ws-form-item label="装车日期:" span="1" prop="sendDateStart">
+            <ws-date-picker
+              v-if="item.status == '已装车'||item.status == '已送达'" 
+              :disabled="readonly"
+              v-model="item.sendDateStart"
+              type="date"
+              style="width: 150px;"
+              placeholder="请选择日期"
+              value-format="yyyy-MM-dd"
+            />
+               <ws-date-picker
+              v-else
+              v-model="item.sendDateStart"
+              type="date"
+              style="width: 150px;"
+              placeholder="请选择日期"
+              value-format="yyyy-MM-dd"
+            />
+          </ws-form-item>
             <!--磅单-->
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <!-- slot-scope="scope" -->
@@ -244,6 +285,13 @@
       </div>
       <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
+        <!--阶段状态-->
+         <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
+          未完货
+        </span>
+        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
+          deptBudgetList.feedbackStatus
+        }}</span>
       </div>
       <!-- <el-button class="add bg-bottom" type="primary" size="small" @click="add">
         <img width="22" height="22" src="../../../public/img/add.png" alt="" />
@@ -251,7 +299,7 @@
       > -->
     </ws-form>
     <!-- 提交 -->
-    <div style="text-align: right; padding: 10px" class="center">
+    <div style="margin-left: 1300px;" >
       <el-button
         class="bg-bottom"
         type="primary"
@@ -259,12 +307,19 @@
         @click="submit(deptBudgetList)"
         >提交</el-button
       >
+      <el-button
+        class="bg-bottom"
+        type="primary"
+        size="small"
+        @click="finished (deptBudgetList)"
+        >完货</el-button
+      >
     </div>
   </div>
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback, getbank } from '@/model/transport/index'
+import { seeCat, packList, feedback, getbank ,state} from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -456,6 +511,42 @@ export default {
     handleClose() {
       this.accessoryTFs = false
     },
+    //导入
+    import(){
+
+    },
+    finished(){
+       this.$confirm(`完货操作后，装车信息不可修改，是否确定完货？`, {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.$refs.deptBudgetList.validate((valid) => {
+            if (valid) {
+              var tranProcessInfo = {}
+              tranProcessInfo.id = this.deptBudgetList.id
+              state(tranProcessInfo)
+                .toPromise()
+                .then((response) => {
+                  this.$message.success('完货成功')
+                  this.deptBudgetList = {}
+                  this.freightspace = {}
+                  this.selectedOptions = ''
+                  this.$router.push({
+                    path: 'tranManagementTransporHairRespond',
+                  })
+                })
+            } else {
+              return false
+            }
+          })
+        })
+        .catch(() => {
+          return false
+        })
+
+    },
     submit() {
       for (var i = 0; i < this.freightspace.length; i++) {
         if (this.freightspace[i].temporaryDriverFlag != 0) {
@@ -736,7 +827,7 @@ export default {
     margin-left: 10px;
     &/deep/.auditFlow-icon {
       width: auto;
-      padding-right: 30px;
+      padding-right: 5px;
     }
     &/deep/.auditFlow-main {
       position: absolute;
@@ -770,7 +861,7 @@ export default {
   padding-left: 30px;
 }
 .bg-right {
-  padding-right: 10px;
+  padding-right: 2px;
   text-align: right;
 }
 .bg-bottom {
@@ -1003,6 +1094,23 @@ export default {
   margin-top: 6px;
   left: 2px;
 }
+//送达/未送达
+.noservice,
+.service {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+}
+.noservice {
+  background: #c4cada;
+  color: #ffffff;
+}
+.service {
+  background: #e5f1f7;
+  color: #50cad4;
+}
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__content{
   padding: 0px;
 }

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -101,6 +101,15 @@
           <ws-info-table>
             <div class="catNos" v-show="item.temporaryDriverFlag == 0">
               司机-{{ index + 1 }}
+               <span class="noservice" v-show="item.status == '未装车'">{{
+                  item.status
+                }}</span>
+                <span class="service" v-show="item.status == '已装车'">{{
+                  item.status
+                }}</span>
+                 <span class="serviced" v-show="item.status == '已送达'">{{
+                  item.status
+                }}</span>
             </div>
             <div
               class="catNos catNosCor"
@@ -125,6 +134,10 @@
             <ws-form-item label="装车净重(吨):" span="1" prop="loadNetWeight">
               {{ item.loadNetWeight }}
             </ws-form-item>
+             <!--装车日期-->
+            <el-form-item label="装车日期:" span="1" prop="sendDateStart" >
+              {{ item.sendDateStart }}
+          </el-form-item>
             <!--磅单-->
             <ws-form-item label="磅单:" span="1" prop="loadPoundImg">
               <template>
@@ -189,6 +202,13 @@
       </div>
       <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
+         <!--阶段状态-->
+         <span class="noservice" v-show="deptBudgetList.feedbackStatus=='执行中'">
+          未完货
+        </span>
+        <span class="service" v-show="deptBudgetList.feedbackStatus=='已完货'">{{
+          deptBudgetList.feedbackStatus
+        }}</span>
       </div>
     </ws-form>
     <!-- 提交 -->
@@ -808,4 +828,21 @@ export default {
   color: #5473e8;
   line-height: 24px;
 }
+//送达/未送达
+.noservice,
+.service {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  padding: 2px;
+  font-size: 12px;
+}
+.noservice {
+  background: #c4cada;
+  color: #ffffff;
+}
+.service {
+  background: #e5f1f7;
+  color: #50cad4;
+}
 </style>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -106,7 +106,7 @@
                     class="inExecution"
                   ></span>
                   <span
-                    v-if="scope.row.feedbackStatus == '已完成'"
+                    v-if="scope.row.feedbackStatus == '已完货'"
                     class="done"
                   ></span
                   >{{ scope.row.feedbackStatus }}
@@ -149,25 +149,12 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <template
-              v-if="
-                scope.row.tranType == '汽运' &&
-                scope.row.feedbackStatus != '已完成'
-              "
-            >
+            <template v-if="scope.row.feedbackStatus != '已完货'">
               <div class="record" @click="trainSee(scope.row)">查看</div>
               <div class="adjustment" @click="feedback(scope.row)">反馈</div>
             </template>
-            <template
-              v-else-if="
-                scope.row.tranType == '汽运' &&
-                scope.row.feedbackStatus == '已完成'
-              "
-            >
-              <div class="record1" @click="trainSee(scope.row)">查看</div>
-            </template>
             <template v-else>
-              <div class="record1">—— ——</div>
+              <div class="record1" @click="trainSee(scope.row)">查看</div>
             </template>
           </template>
         </el-table-column>
@@ -230,7 +217,7 @@ export default {
       searchTypeOne: 1,
       taskTypeList: [
         { value: '执行中', type: 1 },
-        { value: '已完成', type: 2 },
+        { value: '已完货', type: 2 },
         { value: '全部任务', type: 3 },
       ],
       // 提交类型
@@ -284,7 +271,7 @@ export default {
         // }
       })
     },
-    //查看火运调度详细
+    //查看
     trainSee(row) {
       if (row.tranType == '汽运') {
         this.$router.push({
@@ -293,16 +280,46 @@ export default {
             id: row.id,
           },
         })
+      } else if (row.tranType == '火运') {
+        this.$router.push({
+          path: 'tranManagementFireFeedbackLook',
+          query: {
+            id: row.id,
+          },
+        })
+      } else if (row.tranType == '船运') {
+        this.$router.push({
+          path: 'tranManagementShippingFeedbackLook',
+          query: {
+            id: row.id,
+          },
+        })
       }
     },
     //反馈
     feedback(row) {
-      this.$router.push({
-        path: 'tranManagementTransporFeedback',
-        query: {
-          id: row.id,
-        },
-      })
+      if (row.tranType == '汽运') {
+        this.$router.push({
+          path: 'tranManagementTransporFeedback',
+          query: {
+            id: row.id,
+          },
+        })
+      } else if (row.tranType == '火运') {
+        this.$router.push({
+          path: 'tranManagementFireFeedback',
+          query: {
+            id: row.id,
+          },
+        })
+      } else if (row.tranType == '船运') {
+        this.$router.push({
+          path: 'tranManagementShippingFeedback',
+          query: {
+            id: row.id,
+          },
+        })
+      }
     },
     // statusquery(status) {
     //    if (status == 1) {
@@ -370,10 +387,10 @@ export default {
     },
     editClick(row) {
       var feedbackStatus = ''
-      if (row.feedbackStatus == '待执行' || row.feedbackStatus == '已完成') {
+      if (row.feedbackStatus == '待执行' || row.feedbackStatus == '已完货') {
         feedbackStatus = '执行中'
       } else if (row.feedbackStatus == '执行中') {
-        feedbackStatus = '已完成'
+        feedbackStatus = '已完货'
       }
       //cancelButtonClass: "btn-custom-cancel"
       this.$confirm(`是否将状态改为${feedbackStatus}`, {
@@ -417,9 +434,9 @@ export default {
           this.startDate = ''
           this.endDate = ''
         }
-      }else{
-         this.startDate = ''
-          this.endDate = ''
+      } else {
+        this.startDate = ''
+        this.endDate = ''
       }
       this.currentPage = 1
       this.getList()