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

src/api/V2/houseSelfCollect/index.js

@@ -30,5 +30,16 @@ export const API_POST_INSPECT_ADD = '/qualityInspectionManagement/api/addQuality
 export const API_GET_INSPECT_GETBINNUMBER = '/warehouseBaseInfo/getWarehouse'
 //客户下拉
 export const API_GET_INSPECT_GETCUSTOMER = '/identityAuthenticationInfo/identityAuthenticationInfoCustomer'
-
+//质检列表
+export const API_GET_INSPECT_GETINSPECTLIST = '/qualityInspectionManagement/selectQualityInspection'
+//质检查看
+export const API_GET_INSPECT_GETINSPECTLOOK = '/qualityInspectionManagement/api/getQualityInspection'
+//质检查看潮粮单价
+export const API_GET_INSPECT_GETINSPECTLOOKUNITPRICE = '/purchasePrice/tidalGrainPrice'
+//质检货名下拉
+export const API_GET_INSPECT_GETINSPECTLOOKGOODS = '/qualityInspectionManagement/api/goodsName'
+//质检修改
+export const API_POST_INSPECT_GETINSPECTEDIT = '/qualityInspectionManagement/api/editQualityInspection'
+//质检删除
+export const API_POST_INSPECT_GETINSPECTDELETE = '/qualityInspectionManagement/api/deleteQualityInspection'
 

src/lang/zh.js

@@ -998,7 +998,8 @@
     customerManagementEdit:'客户管理编辑',
     customerManagementAdd:'客户管理添加',
     settlement:'结算',
-    inspectInfo:'质检信息'
+    inspectInfo:'质检信息',
+    weightCheck:'检斤'
   },
   // 后台错误码
   message: {
@@ -7424,7 +7425,8 @@
     customerManagementEdit:'客户管理编辑',
     customerManagementAdd:'客户管理添加',
     settlement:'结算',
-    inspectInfo:'质检信息'
+    inspectInfo:'质检信息',
+    weightCheck:'检斤'
 
   }
 

src/model/houseSelfCollect/index.js

@@ -18,6 +18,12 @@ import {
   API_POST_INSPECT_ADD,
   API_GET_INSPECT_GETBINNUMBER,
   API_GET_INSPECT_GETCUSTOMER,
+  API_GET_INSPECT_GETINSPECTLIST,
+  API_GET_INSPECT_GETINSPECTLOOK,
+  API_GET_INSPECT_GETINSPECTLOOKUNITPRICE,
+  API_GET_INSPECT_GETINSPECTLOOKGOODS,
+  API_POST_INSPECT_GETINSPECTEDIT,
+  API_POST_INSPECT_GETINSPECTDELETE
 
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
@@ -53,5 +59,16 @@ export const inspectAdd = appRx.post(API_POST_INSPECT_ADD, errorCatcher, errorHa
 export const getbinNumber = appRx.get(API_GET_INSPECT_GETBINNUMBER, errorCatcher, errorHandle, filter)
 //客户下拉
 export const getcustomer = appRx.get(API_GET_INSPECT_GETCUSTOMER, errorCatcher, errorHandle, filter)
-
+//质检列表
+export const getinspectList = appRx.get(API_GET_INSPECT_GETINSPECTLIST, errorCatcher, errorHandle, filter)
+//质检查看
+export const getinspectLook = appRx.get(API_GET_INSPECT_GETINSPECTLOOK, errorCatcher, errorHandle, filter)
+//质检查看潮粮单价
+export const getinspectLookUnitPrice = appRx.get(API_GET_INSPECT_GETINSPECTLOOKUNITPRICE, errorCatcher, errorHandle, filter)
+//质检查看货名下拉
+export const getinspectLookGoods = appRx.get(API_GET_INSPECT_GETINSPECTLOOKGOODS, errorCatcher, errorHandle, filter)
+//质检修改
+export const getinspectEdit = appRx.post(API_POST_INSPECT_GETINSPECTEDIT, errorCatcher, errorHandle, filter)
+//质检删除
+export const getinspectDelete = appRx.post(API_POST_INSPECT_GETINSPECTDELETE, errorCatcher, errorHandle, filter)
 

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

@@ -170,6 +170,20 @@ const houseSelfCollectRouter = {
       },
       hidden: true
     },
+    {
+      path: 'weightCheck',
+      component: () =>
+        import(/* webpackChunkName: "sparepartList" */ '@/views/houseSelfCollect/weightCheck'),
+      name: 'weightCheck',
+      meta: {
+        title: 'weightCheck',
+        shortcutEntrance: 'weightCheck',
+        module: 'procurement.procurementOrder.delete',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
   ],
 
 };

src/views/houseSelfCollect/customerManagement.vue

@@ -263,6 +263,7 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          this.warehouseList = []
           for (let i = 0; i < response.length; i++) {
             this.warehouseList.push({
               value: response[i].warehouseName,

src/views/houseSelfCollect/houseSelfCollectPrint.vue

@@ -1,8 +1,8 @@
 <!--打印-->
 <template>
   <div id="print" class="center">
-   <div class="title">中天昊元粮食贸易有限公司结算凭证</div>
-   
+   <div class="title">{{name}}</div>
+    <div @click="print">打印</div>
   </div>
 </template>
 <script>
@@ -21,14 +21,25 @@ export default {
   data() {
     return {
       tableData:{},
+      name:""
  
     }
   },
   activated() {
 
+  },
+  created(){debugger
+  // this.$route.query.type
+this.name = this.$route.query.name
   },
   methods: {
-
+print(){
+        let newstr = document.getElementById('print').innerHTML
+      let oldstr = document.body.innerHTML
+      document.body.innerHTML = newstr
+      window.print()
+            document.body.innerHTML = oldstr
+}
   },
 }
 </script>

src/views/houseSelfCollect/inspectInfo.vue

@@ -22,8 +22,9 @@
         <div style="width: 50%; margin: 0 auto">
           <div class="title">基本信息</div>
           <ws-info-table>
-            <ws-form-item label="编号" span="1" prop="waterContent">
+            <ws-form-item label="编号" span="1" prop="qualityNo">
               <ws-input
+                v-model="inspect.qualityNo"
                 placeholder="请输入编号"
                 maxlength="100"
                 disabled
@@ -82,18 +83,19 @@
             </ws-form-item>
             <ws-form-item label="货名" span="1" prop="goodsName">
               <ws-select
-              v-model="inspect.goodsName"
-              placeholder=""
-              class="typeselect"
-              @change="selectpackingMethod"
-            >
-              <ws-option
-                v-for="item in goodnameList"
-                :key="item.constKey"
-                :label="item.constValue"
-                :value="item.constValue"
-              />
-            </ws-select>
+                v-model="inspect.goodsName"
+                placeholder=""
+                class="typeselect"
+                :disabled="disabled"
+                @change="waterContentChange"
+              >
+                <ws-option
+                  v-for="item in goodnameList"
+                  :key="item.goodsNameKey"
+                  :label="item.goodsName"
+                  :value="item.goodsName"
+                />
+              </ws-select>
             </ws-form-item>
             <ws-form-item label="扣重比" span="1" prop="buckleWeightRatio">
               <ws-input
@@ -113,7 +115,7 @@
                 v-model="inspect.grade"
                 placeholder="请输入等级"
                 class="typeselect"
-                @change="selectpackingMethod"
+                @change="waterContentChange"
                 :disabled="disabled"
               >
                 <ws-option
@@ -139,6 +141,7 @@
                 placeholder="请输入水分占比"
                 maxlength="100"
                 size="small"
+                @change = "waterContentChange"
                 :disabled="disabled"
               />
             </ws-form-item>
@@ -180,7 +183,7 @@
             </ws-form-item>
           </ws-info-table>
           <div style="text-align: right; color: #323233">
-            潮粮单价（元/公斤）：000000000{{ inspect.tidalGrainPrice }}
+            潮粮单价（元/公斤）：{{ inspect.tidalGrainPrice ==null?"0": inspect.tidalGrainPrice}}
           </div>
           <div class="but">
             <el-button @click="cancel" v-if="this.types != 2" type="primary"
@@ -200,10 +203,16 @@
   </div>
 </template>
 <script>
-import { inspectAdd,getCustomerManage,getbinNumber,getcustomer } from '@/model/houseSelfCollect/index'
 import {
-  packList,
-} from '@/model/contarct/index'
+  inspectAdd,
+  getbinNumber,
+  getcustomer,
+  getinspectLook,
+  getinspectLookUnitPrice,
+  getinspectLookGoods,
+  getinspectEdit
+} from '@/model/houseSelfCollect/index'
+import { packList } from '@/model/contarct/index'
 import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
 export default {
   components: {
@@ -217,16 +226,18 @@ export default {
       disabled: false,
       types: '',
       information: '添加',
-      goodnameList:[],
-      gradeList:[],
-      customerList:[],
-      getbinNumberList:[],
-      id:"",
+      goodnameList: [],
+      gradeList: [],
+      customerList: [],
+      getbinNumberList: [],
+      cangid: '', //仓库id
+      // calculation:''
     }
   },
   activated() {
     this.types = this.$route.query.type
-    this.id = this.$route.query.id
+    this.cangid = this.$route.query.cangid
+    let id = this.$route.query.id
     if (this.types == 2) {
       this.disabled = true
       this.information = '查看'
@@ -234,52 +245,104 @@ export default {
       this.disabled = false
       this.information = '编辑'
     }
-    this.getList()
+    this.calculation()
+    this.getList(id)
   },
   methods: {
+    getdate() {
+      var date = new Date()
+      var year = date.getFullYear() //获取完整的年份(4位)
+      var mouth = date.getMonth() + 1 //获取当前月份(0-11,0代表1月)
+      var datetime = date.getDate() //获取当前日(1-31)
+      if (mouth < 10) {
+        mouth = '0' + mouth
+      }
+      if (datetime < 10) {
+        datetime = '0' + datetime
+      }
+      return year + mouth + datetime
+    },
+    calculation() {
+      this.inspect.qualityNo = 'SGRK' + this.getdate()
+      // + this.verifyinit()
+    },
     print() {
-      this.$confirm('确定保存质检信息？', '提示', {
+      if(this.types == 1){
+         this.$confirm('确定保存质检信息？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
+          // return
           inspectAdd(this.inspect)
             .toPromise()
             .then((response) => {
-              // this.customerList.id = response
-              // customerIdentity(this.customerList)
-              //   .toPromise()
-              //   .then((response) => {
-                  // console.log(response.code)
-                  this.$message.success('保存成功')
-                  // this.$router.push({ path: 'customerManagement' })
+              this.$message.success('保存成功')
+              // 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
+        })
 
-                  // 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' })
-                // })
+      }else if(this.types == 3){
+         this.$confirm('确定保存质检信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          // return
+          getinspectEdit(this.inspect)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('修改成功')
+              // 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' })
     },
-    //货名改变事件
-    selectpackingMethod(){
-
+    waterContentChange() {
+      //潮粮单价改变事件
+      getinspectLookUnitPrice({
+        warehouseId: this.cangid,
+        goodsName: this.inspect.goodsName,
+        waterContent: this.inspect.waterContent,
+        grade:this.inspect.grade
+      })
+        .toPromise()
+        .then((response) => {
+          this.inspect.tidalGrainPrice = response
+        })
     },
-    getList(){
-        // 货名
-      packList({ constId: 'CON2' })
+    //货名改变事件
+    selectpackingMethod() {},
+    getList(ids) {
+      // 货名
+      getinspectLookGoods({ warehouseId: this.cangid })
         .toPromise()
         .then((response) => {
           this.goodnameList = response
@@ -290,37 +353,43 @@ export default {
         .then((response) => {
           this.gradeList = response
         })
-        //客户
-        getcustomer({ compId: sessionStorage.getItem('ws-pf_compId') })
+      //客户
+      getcustomer({ compId: sessionStorage.getItem('ws-pf_compId') })
         .toPromise()
         .then((response) => {
           // this.gradeList = response
-           let customer = response
-          for(let i = 0 ; i < response.length ; i++ ){
-            customer = response[i].customerName +"(" + response[i].customerPhone + ")"
+          this.customerList = []
+          let customer = response
+          for (let i = 0; i < response.length; i++) {
+            customer =
+              response[i].customerName + '(' + response[i].customerPhone + ')'
             this.customerList.push({
-              valueKey:i,
-              value:customer
+              valueKey: i,
+              value: customer,
             })
-
-
           }
-         
-          console.log( this.customerList)
         })
-        // 仓位
-      getbinNumber({ id:this.id })
+      // 仓位
+      getbinNumber({ id: this.cangid })
         .toPromise()
         .then((response) => {
-          for(let i = 0 ; i < response.warehousePositionInfoList.length;i++ ){
-             this.getbinNumberList.push({
-               value:response.warehousePositionInfoList[i].binNumber
-             })
+          this.getbinNumberList=[]
+          for (let i = 0; i < response.warehousePositionInfoList.length; i++) {
+            this.getbinNumberList.push({
+              value: response.warehousePositionInfoList[i].binNumber,
+            })
           }
           // this.getbinNumberList = response.warehousePositionInfoList
         })
-
-    }
+      if (this.types == 2 || this.types == 3) {
+        //查看
+        getinspectLook({ id: ids })
+          .toPromise()
+          .then((response) => {
+            this.inspect = response
+          })
+      }
+    },
   },
 }
 </script>

src/views/houseSelfCollect/inspectionManagement.vue

@@ -44,9 +44,9 @@
       </template>
     </BaseHeaderLayout>
     <el-table
-      :data="warehouseList1"
+      :data="inspect"
       style="width: 100%; margin-top: 20px"
-      ref="warehouseList1"
+      ref="inspect"
       border
       height="780"
     >
@@ -57,45 +57,49 @@
         </template>
       </el-table-column>
       <el-table-column
-        prop="contractNo"
+        prop="qualityNo"
         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="customerName" label="客户"></el-table-column>
+      <el-table-column prop="carNumber" label="车牌号"></el-table-column>
+      <el-table-column prop="goodsName" label="货名"></el-table-column>
+      <el-table-column prop="waterContent" label="水分（%）"></el-table-column>
       <el-table-column
-        prop="contractNo"
+        prop="tidalGrainPrice"
         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 prop="binNumber" label="仓位号"></el-table-column>
+      <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
+      <el-table-column prop="qualityInspector" label="质检员"></el-table-column>
+      <el-table-column prop="qualityDate" label="质检时间"></el-table-column>
+      <el-table-column prop="status" label="状态"></el-table-column>
+      <el-table-column width="300" label="操作">
+        <template slot-scope="scope">
+          <el-button @click="inspectInfo(scope.row, 2)">查看</el-button>
+          <el-button @click="inspectInfo(scope.row, 3)">编辑</el-button>
+          <el-button @click="del(scope.row)">删除</el-button>
+        </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 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{
-selectWarehouseSelf
+import {
+  selectWarehouseSelf,
+  getinspectList,
+  getinspectDelete,
 } from '@/model/houseSelfCollect/index'
 
 export default {
@@ -103,44 +107,60 @@ export default {
   watch: {},
   data() {
     return {
-       //分页
+      //分页
       currentPage: 1,
       pageSize: 10,
-      deptCircularPage:{},
+      deptCircularPage: {},
       deptBudgetTotal: 0,
 
       searchKeyWord: '',
       taskTypeList: [],
       searchType: 0,
       searchTypeText: '',
-      warehouseList1: [
-        {
-          contractNo: '快付款',
-        },
-      ],
-      warehouseList:[],
-      id:"",//仓库id
+      inspect: [],
+      warehouseList: [],
+      cangid: '', //仓库id
     }
   },
   activated() {
     this.getList()
   },
   methods: {
-    inspectInfo(index) {
+    find(){
+     this.getList()
+    },
+    inspectInfo(row, index) {
       //添加,编辑，查看
-      this.$router.push({ path: 'inspectInfo', query: { type: index,id:this.id } })
+      console.log(row.id, 'id值')
+      this.$router.push({
+        path: 'inspectInfo',
+        query: { type: index, cangid: this.cangid, id: row.id },
+      })
     },
     selecttaskType(e) {
       console.log(e)
     },
-    del() {
+    del(row) {
       //删除
       this.$confirm('确定删除质检信息？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       })
-        .then(() => {})
+        .then(() => {
+          getinspectDelete({ id: row.id })
+            .toPromise()
+            .then((response) => {
+              this.$notify.success({
+                title: '成功',
+                message: '删除成功',
+              })
+              this.getList()
+            })
+            .catch((response) => {
+              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            })
+        })
         .catch(() => {
           return false
         })
@@ -155,24 +175,48 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    getList(){
+    getList() {
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId'),
         personCharge: sessionStorage.getItem('ws-pf_staffName'),
       })
         .toPromise()
         .then((response) => {
+          this.warehouseList = []
           for (let i = 0; i < response.length; i++) {
             this.warehouseList.push({
-              valueKey: i,
+              // valueKey: i,
               value: response[i].warehouseName,
-              id:response[i].id
+              id: response[i].id,
             })
           }
           this.searchTypeText = response[0].warehouseName
-          this.id = response[0].id
+          this.cangid = response[0].id
         })
-    }
+
+      getinspectList({
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        searchKeyWord: this.searchKeyWord,
+        searchTypeText: this.searchTypeText,
+      })
+        .toPromise()
+        .then((response) => {
+          // for (let i = 0; i < response.length; i++) {
+          //   this.warehouseList.push({
+          //     valueKey: i,
+          //     value: response[i].warehouseName,
+          //     id:response[i].id
+          //   })
+          // }
+          // this.searchTypeText = response[0].warehouseName
+          // this.id = response[0].id
+          // console.log(response)
+          this.inspect = response.records
+          this.deptBudgetTotal = response.total
+        })
+    },
   },
 }
 </script>

src/views/houseSelfCollect/settlement.vue

@@ -327,15 +327,15 @@
         </div>
       </ws-form>
     </div>
-    <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint>
+    <!-- <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint> -->
   </div>
 </template>
 <script>
 import {} from '@/model/houseSelfCollect/index'
-import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
+// import houseSelfCollectPrint from './houseSelfCollectPrint.vue'
 export default {
   components: {
-    houseSelfCollectPrint,
+    // houseSelfCollectPrint,
   },
   watch: {},
   data() {
@@ -359,14 +359,22 @@ export default {
   },
   methods: {
     print() {
+      debugger
       // this.xx = true;
-      let newstr = document.getElementById('print').innerHTML
-      let oldstr = document.body.innerHTML
-      document.body.innerHTML = newstr
-      window.print()
-      document.body.innerHTML = oldstr
+      // let newstr = document.getElementById('print').innerHTML
+      // let oldstr = document.body.innerHTML
+      // document.body.innerHTML = newstr
+      // window.print()
+        this.$router.push({ path: 'houseSelfCollectPrint',
+            query:{
+          name:"123"
+        }
+        },
+    
+        )
+      // document.body.innerHTML = oldstr
       // window.location.reload()
-      this.$router.push({ path: 'paymentManagement' })
+      // this.$router.push({ path: 'paymentManagement' })
     },
     cancel() {
       this.$router.push({ path: 'paymentManagement' })

src/views/houseSelfCollect/weightCheck.vue

@@ -0,0 +1,175 @@
+<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>
+      <ws-form>
+        <div style="width: 50%; margin: 0 auto">
+          <div class="title">基本信息</div>
+          <ws-info-table>
+            <ws-form-item label="编号" span="1" prop="qualityNo">
+              <ws-input
+                v-model="inspect.qualityNo"
+                placeholder="请输入编号"
+                maxlength="100"
+                disabled
+                size="small"
+              />
+            </ws-form-item>
+            <ws-form-item label="仓位号" span="1" prop="binNumber">
+              <ws-select
+                v-model="inspect.binNumber"
+                placeholder="请输入仓位号"
+                class="typeselect"
+                @change="selectpackingMethod"
+                :disabled="disabled"
+              >
+                <ws-option
+                  v-for="item in getbinNumberList"
+                  :key="item.value"
+                  :label="item.value"
+                  :value="item.value"
+                />
+              </ws-select>
+            </ws-form-item>
+            <ws-form-item label="客户" span="1" prop="customerName">
+              <ws-select
+                v-model="inspect.customerName"
+                placeholder="请输入客户"
+                class="typeselect"
+                @change="selectpackingMethod"
+                :disabled="disabled"
+              >
+                <ws-option
+                  v-for="item in customerList"
+                  :key="item.valueKey"
+                  :label="item.value"
+                  :value="item.value"
+                />
+              </ws-select>
+            </ws-form-item>
+            <ws-form-item label="囤位号" span="1" prop="storageTagNo">
+              <ws-input
+                v-model="inspect.storageTagNo"
+                placeholder="请输入囤位号"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="车牌号" span="1" prop="carNumber">
+              <ws-input
+                v-model="inspect.carNumber"
+                placeholder="请输入车牌号"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="货名" span="1" prop="goodsName">
+              <ws-select
+                v-model="inspect.goodsName"
+                placeholder=""
+                class="typeselect"
+                :disabled="disabled"
+                @change="waterContentChange"
+              >
+                <ws-option
+                  v-for="item in goodnameList"
+                  :key="item.goodsNameKey"
+                  :label="item.goodsName"
+                  :value="item.goodsName"
+                />
+              </ws-select>
+            </ws-form-item>
+            <ws-form-item label="毛重（公斤）" span="1" prop="buckleWeightRatio">
+              <ws-input
+                v-model="inspect.buckleWeightRatio"
+                placeholder="请输入毛重"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+             <ws-form-item label="皮重（公斤）" span="1" prop="buckleWeightRatio">
+              <ws-input
+                v-model="inspect.buckleWeightRatio"
+                placeholder="请输入皮重）"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+             <ws-form-item label="扣杂（公斤）" span="1" prop="buckleWeightRatio">
+              <ws-input
+                v-model="inspect.buckleWeightRatio"
+                placeholder="请输入扣杂"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+            <ws-form-item label="净重（公斤）" span="1" prop="buckleWeightRatio">
+              <ws-input
+                v-model="inspect.buckleWeightRatio"
+                placeholder="请输入净重"
+                maxlength="100"
+                size="small"
+                :disabled="disabled"
+              />
+            </ws-form-item>
+          </ws-info-table>
+           
+          
+          <div style="text-align: right; color: #323233">
+            潮粮单价（元/公斤）：{{
+              inspect.tidalGrainPrice == null ? '0' : inspect.tidalGrainPrice
+            }}
+          </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>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+        inspect:{},
+        types:1,
+    }
+  },
+  activated() {},
+  methods: {},
+}
+</script>
+<style lang="scss" scoped>
+.center {
+  background: #f6f7fc;
+}
+</style> 

src/views/tranManagement/tranManagementFireFeedback.vue

@@ -191,6 +191,16 @@
             <!--装车日期-->
             <el-form-item label="装车日期:" span="1" prop="loadingDate">
               <ws-date-picker
+                 v-if="item.status == '已装车' || item.status == '已送达'"
+                :disabled="readonly"
+                v-model="item.loadingDate"
+                type="date"
+                style="width: 150px"
+                placeholder="请选择日期"
+                value-format="yyyy-MM-dd"
+              />
+              <ws-date-picker
+                v-else
                 v-model="item.loadingDate"
                 type="date"
                 style="width: 150px"
@@ -200,7 +210,11 @@
             </el-form-item>
 
             <!-- 提交 -->
-            <span class="servicein" v-show="item.status == '已装车' || item.status == '已送达'">已装车</span>
+            <span
+              class="servicein"
+              v-show="item.status == '已装车' || item.status == '已送达'"
+              >已装车</span
+            >
             <span
               style="text-align: right; padding: 10px"
               class="center"
@@ -263,16 +277,15 @@
         class="bg-bottom"
         type="primary"
         size="small"
-        @click="submit(deptBudgetList)"
+        @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 { getstaff } from '@/model/warehouse/index'
+import { regionData } from 'element-china-area-data'
+import { seeCat, feedback, state } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -419,6 +432,38 @@ export default {
     revert() {
       this.$router.push({ path: 'tranManagementTransporHairRespond' })
     },
+    //完货
+    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) {
@@ -466,6 +511,7 @@ export default {
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
               this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
               this.tranCarInfoList.carNo = this.deptBudgetList.carNo
+              this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
               this.tranCarInfoList.loadNetWeight =
                 this.deptBudgetList.loadNetWeight
               this.tranCarInfoList.tranType = this.tranType
@@ -516,8 +562,7 @@ export default {
           this.deptBudgetList.driver = response.tranCarInfoList[0].driver
           this.deptBudgetList.driverPhone =
             response.tranCarInfoList[0].driverPhone
-          this.deptBudgetList.sendDateStart =
-            response.tranCarInfoList[0].sendDateStart
+          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart) 
           this.deptBudgetList.receiveDateEnd =
             response.tranCarInfoList[0].receiveDateEnd
           this.deptBudgetList.carModel = response.tranCarInfoList[0].carModel

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -141,7 +141,7 @@
             <!--卸车净重-->
             <ws-form-item label="卸车净重：" span="1" prop="unloadNetWeight">
               <ws-input
-                v-if="item.status == '已卸车' || item.status == '已送达'"
+                v-if="item.status == '未装车' || item.status == '已送达'"
                 :disabled="readonly"
                 v-model="item.unloadNetWeight"
                 placeholder="请输入卸车净重"
@@ -195,6 +195,16 @@
             <!--卸车日期-->
             <el-form-item label="卸车日期:" span="1" prop="unloadingDate">
               <ws-date-picker
+                v-if="item.status == '未装车' || item.status == '已送达'"
+                :disabled="readonly"
+                v-model="item.unloadingDate"
+                type="date"
+                style="width: 150px"
+                placeholder="请选择日期"
+                value-format="yyyy-MM-dd"
+              />
+             <ws-date-picker
+                v-else
                 v-model="item.unloadingDate"
                 type="date"
                 style="width: 150px"
@@ -273,16 +283,15 @@
         class="bg-bottom"
         type="primary"
         size="small"
-        @click="submit(deptBudgetList)"
+        @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 { getstaff } from '@/model/warehouse/index'
+import { regionData } from 'element-china-area-data'
+import { seeCat, feedback, stateRec } from '@/model/transport/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
 export default {
@@ -426,6 +435,38 @@ export default {
         this.freightspace.splice(index, 1)
       }
     },
+    //完货
+    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
+        })
+    },
     submit() {
       for (var i = 0; i < this.freightspace.length; i++) {
         if (this.freightspace[i].temporaryDriverFlag != 0) {
@@ -470,7 +511,9 @@ export default {
               // this.deptBudgetList.totalStorage = this.totalStorage
               this.tranCarInfoList = this.freightspace
               this.tranCarInfoList.driver = this.deptBudgetList.driver
-              this.tranCarInfoList.unloadingDate = this.deptBudgetList.unloadingDate
+              this.tranCarInfoList.unloadingDate =
+                this.deptBudgetList.unloadingDate
+              this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
               this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
               this.tranCarInfoList.carNo = this.deptBudgetList.carNo
@@ -527,8 +570,7 @@ export default {
           this.deptBudgetList.driver = response.tranCarInfoList[0].driver
           this.deptBudgetList.driverPhone =
             response.tranCarInfoList[0].driverPhone
-          this.deptBudgetList.sendDateStart =
-            response.tranCarInfoList[0].sendDateStart
+          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart) 
           this.deptBudgetList.receiveDateEnd =
             response.tranCarInfoList[0].receiveDateEnd
           this.deptBudgetList.carModel = response.tranCarInfoList[0].carModel

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -314,7 +314,7 @@
               </ws-form-item>
             </div>
             <span
-              v-if="item.status == '未装车'&& item.shipType == '散船'" 
+              v-if="(item.status == '未装车'&& item.shipType == '散船') || item.status == null" 
               width="22"
               height="22"
               class="del"
@@ -323,6 +323,9 @@
               alt=""
               >×</span>
           </div>
+          <div style="text-align: right; color: #8890b1; font-size: 16px; margin-right: -40%" v-show="deptBudgetList.tranCarInfoList[0].shipType == '散船'">
+            共{{ total }}/{{ deptBudgetList.weight }}         
+          </div>
           <el-button
             class="add bg-bottom"
             type="primary"
@@ -459,6 +462,17 @@ export default {
       }
       return maxStorage
     },
+    total: function () {
+      if (this.deptBudgetList.tranCarInfoList.length > 0) {
+        var maxStorage = 0
+        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          maxStorage += Number(
+            this.deptBudgetList.tranCarInfoList[i].positionWeight
+          )
+        }
+        return maxStorage
+      }
+    },
   },
   methods: {
     getList() {
@@ -552,7 +566,12 @@ export default {
       this.$router.go(-1)
     },
     del(index, row) {
-      this.$confirm('船次信息删除后不可恢复，是否确定删除？', '提示', {
+      if(row.status == null){
+        if (this.deptBudgetList.tranCarInfoList.length > 1) {
+                  this.deptBudgetList.tranCarInfoList.splice(index, 1)
+               }
+      }else{
+        this.$confirm('船次信息删除后不可恢复，是否确定删除？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning',
@@ -566,6 +585,7 @@ export default {
                }
             })
         })
+      }
     },
     add() {
       this.deptBudgetList.tranCarInfoList.push({

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -377,6 +377,7 @@ export default {
     return {
       deptBudgetList: {
         totalStorage: 0,
+        sendDateStart:''
       },
       tranCarInfoList: {
         loadPoundImg: '',
@@ -639,14 +640,7 @@ export default {
             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.sendDateStart = this.deptBudgetList.sendDateStart
-              this.tranCarInfoList.receiveDateEnd = this.deptBudgetList.receiveDateEnd
-              this.tranCarInfoList.shipName = this.deptBudgetList.shipName  
-              this.tranCarInfoList.shipNo = this.shipNo
-              this.tranCarInfoList.shipType = this.deptBudgetList.shipType
-              this.tranCarInfoList.boxNumber = this.deptBudgetList.boxNumber
+              this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
               // this.tranCarInfoList.boxNo = this.arr.toString()
               for (var i = 0; i < this.tranCarInfoList.length; i++) {
                 this.tranCarInfoList[i].id = this.freightspace[i].id
@@ -689,8 +683,7 @@ export default {
           this.deptBudgetList.driver = response.tranCarInfoList[0].driver
           this.deptBudgetList.driverPhone =
             response.tranCarInfoList[0].driverPhone
-          this.deptBudgetList.sendDateStart =
-            response.tranCarInfoList[0].sendDateStart
+          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart) 
           this.deptBudgetList.receiveDateEnd =
             response.tranCarInfoList[0].receiveDateEnd
           this.deptBudgetList.shipName = response.tranCarInfoList[0].shipName

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -44,7 +44,8 @@
         <!--发货地址-->
         <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
           {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
-          }}{{ deptBudgetList.sendArea }}{{ deptBudgetList.sendDetailedAddress }}
+          }}{{ deptBudgetList.sendArea
+          }}{{ deptBudgetList.sendDetailedAddress }}
         </ws-form-item>
         <!--发货人-->
         <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
@@ -62,7 +63,8 @@
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
           {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
-          }}{{ deptBudgetList.receiveArea }}{{ deptBudgetList.receiveDetailedAddress }}
+          }}{{ deptBudgetList.receiveArea
+          }}{{ deptBudgetList.receiveDetailedAddress }}
         </ws-form-item>
         <!--收货人-->
         <ws-form-item label="收货人" span="1" prop="receiver">
@@ -153,19 +155,29 @@
               />
             </el-select>
           </ws-form-item>
-          <ws-form-item
-              :label="'车厢号' "
-              span="1"
-              prop="boxNo"
-            >
-              <ws-input
-                v-model="item.boxNo"
-                placeholder="请输入车厢号"
-                maxlength="20"
-                size="small"
-              />
-            </ws-form-item>
+          <ws-form-item :label="'车厢号'" span="1" prop="boxNo">
+            <ws-input
+              v-model="item.boxNo"
+              placeholder="请输入车厢号"
+              maxlength="20"
+              size="small"
+            />
+          </ws-form-item>
+          <!--   -->
         </ws-info-table>
+        <!-- class="del" -->
+        <span
+          v-if="
+            item.status == '未装车' || item.status == '' || item.status == null
+          "
+          width="22"
+          height="22"
+          class="del"
+          @click="del(index, item)"
+          src="../../../public/img/del.png"
+          alt=""
+          >×</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="" />
@@ -174,11 +186,7 @@
     </ws-form>
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="submit()"
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
         >提交</el-button
       >
     </div>
@@ -186,7 +194,12 @@
 </template>
 <script>
 import { regionData } from 'element-china-area-data'
-import { seeCat, dispatchCat, packList } from '@/model/transport/index'
+import {
+  seeCat,
+  dispatchCat,
+  packList,
+  delhaulagestage,
+} from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -296,18 +309,35 @@ export default {
     // },
     add() {
       this.deptBudgetList.tranCarInfoList.push({
-        driver:this.deptBudgetList.tranCarInfoList[0].driver,
-        driverPhone:this.deptBudgetList.tranCarInfoList[0].driverPhone,
-        sendDateStart:this.deptBudgetList.tranCarInfoList[0].sendDateStart,
-        receiveDateEnd:this.deptBudgetList.tranCarInfoList[0].receiveDateEnd,
-        carModel:this.deptBudgetList.tranCarInfoList[0].carModel,
+        driver: this.deptBudgetList.tranCarInfoList[0].driver,
+        driverPhone: this.deptBudgetList.tranCarInfoList[0].driverPhone,
+        sendDateStart: this.deptBudgetList.tranCarInfoList[0].sendDateStart,
+        receiveDateEnd: this.deptBudgetList.tranCarInfoList[0].receiveDateEnd,
+        carModel: this.deptBudgetList.tranCarInfoList[0].carModel,
         boxNo: '',
-        tranType: '2'
+        tranType: '2',
       })
     },
-    del(index) {
-      if (this.freightspace.length > 1) {
-        this.freightspace.splice(index, 1)
+    del(index, row) {
+      if (row.status == '未装车') {
+        this.$confirm('派车信息删除后不可恢复，是否确定删除？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          delhaulagestage({ id: row.id })
+            .toPromise()
+            .then((response) => {
+              this.$message.success('删除成功')
+              if (this.deptBudgetList.tranCarInfoList.length > 1) {
+                this.deptBudgetList.tranCarInfoList.splice(index, 1)
+              }
+            })
+        })
+      } else {
+        if (this.deptBudgetList.tranCarInfoList.length > 1) {
+          this.deptBudgetList.tranCarInfoList.splice(index, 1)
+        }
       }
     },
     //下拉司机姓名改变事件
@@ -374,7 +404,7 @@ export default {
             type: 'warning',
           })
           return
-        } 
+        }
         if (!this.deptBudgetList.tranCarInfoList[i].boxNo) {
           this.$message({
             message: '车厢号不能为空',
@@ -420,7 +450,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
-          if (response.tranCarInfoList.length == 0) 
+          if (response.tranCarInfoList.length == 0)
             this.deptBudgetList.tranCarInfoList = [
               {
                 driver: '',
@@ -429,7 +459,7 @@ export default {
                 receiveDateEnd: '',
                 carModel: '',
                 boxNo: '',
-                tranType :'2'
+                tranType: '2',
               },
             ]
         })
@@ -510,20 +540,6 @@ export default {
 .position {
   position: relative;
 }
-
-.del {
-  position: absolute;
-  // right: -38px;
-  top: 9px;
-  cursor: pointer;
-  right: 0;
-  display: inline-block;
-  font-size: 20px;
-  width: 16px;
-  height: 10px;
-  line-height: 0px;
-}
-
 .amap-page-container {
   width: 300px;
   height: 300px;
@@ -636,7 +652,14 @@ export default {
 .bg-bottom {
   margin: 15px 0px;
 }
-
+.el-input--small {
+  font-size: 13px;
+}
+.el-input {
+  position: relative;
+  display: inline-block;
+  width: 86%;
+}
 .center {
   width: 90%;
   margin: 0 auto;
@@ -709,6 +732,13 @@ export default {
     padding: 0 !important;
   }
 }
+//减号
+.del {
+  position: absolute;
+  cursor: pointer;
+  margin-left: 224px;
+  margin-top: -52px;
+}
 .winseaview-view {
   padding: 0 0 20px;
 }
@@ -821,7 +851,7 @@ export default {
   padding: 0 25px;
   background: #f6f7fc;
 }
-/deep/.liaison .ws-info-table .el-form-item .el-form-item__content{
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
   padding: 0px;
 }
 </style>

src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -602,8 +602,7 @@ export default {
               this.tranCarInfoList = this.freightspace
               this.tranCarInfoList.driver = this.deptBudgetList.driver
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-              this.tranCarInfoList.sendDateStart =
-                this.deptBudgetList.sendDateStart
+              this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
               this.tranCarInfoList.receiveDateEnd =
                 this.deptBudgetList.receiveDateEnd
               this.tranCarInfoList.shipName = this.deptBudgetList.shipName
@@ -653,8 +652,7 @@ export default {
           this.deptBudgetList.driver = response.tranCarInfoList[0].driver
           this.deptBudgetList.driverPhone =
             response.tranCarInfoList[0].driverPhone
-          this.deptBudgetList.sendDateStart =
-            response.tranCarInfoList[0].sendDateStart
+          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart) 
           this.deptBudgetList.receiveDateEnd =
             response.tranCarInfoList[0].receiveDateEnd
           this.deptBudgetList.shipName = response.tranCarInfoList[0].shipName

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -488,6 +488,11 @@ export default {
       this.$router.go(-1)
     },
     del(index, row) {
+      if(row.status == null){
+        if (this.deptBudgetList.tranCarInfoList.length > 1) {
+                  this.deptBudgetList.tranCarInfoList.splice(index, 1)
+               }
+      }else{
       this.$confirm('派车信息删除后不可恢复，是否确定删除？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -502,6 +507,7 @@ export default {
                }
             })
         })
+      }
     },
     add() {
       if(!this.deptBudgetList.tranPrice){