前端gjy

src/views/contractManagement/purchaseContract.vue

@@ -66,9 +66,6 @@
           class="find"
           type="primary"
           @click="find()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
           ><img
             width="16"
             height="16"

src/views/contractManagement/purchaseContractAdd.vue

@@ -443,11 +443,11 @@
       <!--流程信息-->
 
       <ws-info-table>
-        <!--合同收入（元）-->
-        <ws-form-item label="合同收入（元）" span="1" prop="goodsNameKey">
+        <!--已付款（元）-->
+        <ws-form-item label="已付款（元）" span="1" prop="goodsNameKey">
           <ws-input
             v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
-            placeholder="请输入合同收入（元）"
+            placeholder="请输入已付款（元）"
             maxlength="100"
             size="small"
           />
@@ -482,15 +482,6 @@
             size="small"
           />
         </ws-form-item>
-        <!--已完成发货量（吨）-->
-        <ws-form-item label="已完成发货量（吨）" span="1" prop="imperfectGrain">
-          <ws-input
-            v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
-            placeholder="请输入已完成发货量（吨）"
-            maxlength="100"
-            size="small"
-          />
-        </ws-form-item>
         <!--双章原件回收情况-->
         <ws-form-item label="双章原件回收情况" span="1" prop="grade">
           <ws-select
@@ -507,6 +498,15 @@
             />
           </ws-select>
         </ws-form-item>
+        <!--已完成发货量（吨）-->
+        <ws-form-item label="已完成发货量（吨）" span="1" prop="imperfectGrain">
+          <ws-input
+            v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
+            placeholder="请输入已完成发货量（吨）"
+            maxlength="100"
+            size="small"
+          />
+        </ws-form-item>
       </ws-info-table>
 
       <div class="wenzi">
@@ -1223,18 +1223,23 @@ export default {
       var that = this
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
-          this.deptBudgetList.sourceProvince =
-            CodeToText[this.selectedOptions[0]]
-          this.deptBudgetList.sourceCity = CodeToText[this.selectedOptions[1]]
-          this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
-          this.deptBudgetList.deliveryProvince =
-            CodeToText[this.selectedOptions1[0]]
-          this.deptBudgetList.deliveryCity =
-            CodeToText[this.selectedOptions1[1]]
-          this.deptBudgetList.deliveryArea =
-            CodeToText[this.selectedOptions1[2]]
+          this.deptBudgetList.sourceProvince = CodeToText[this.selectedOptions[0]]
+          this.deptBudgetList.sourceCity = CodeToText[this.selectedOptions[1]]     
+          this.deptBudgetList.deliveryProvince = CodeToText[this.selectedOptions1[0]]
+          this.deptBudgetList.deliveryCity = CodeToText[this.selectedOptions1[1]]
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 2
+            if(this.deptBudgetList.deliveryProvince =="澳门特别行政区" || this.deptBudgetList.deliveryProvince == "澳门特别行政区"){
+            this.deptBudgetList.deliveryArea = "特别行政区"
+          }else{ 
+             this.deptBudgetList.deliveryArea = CodeToText[this.selectedOptions1[2]]
+          }
+             if(this.deptBudgetList.sourceProvince =="澳门特别行政区" || this.deptBudgetList.sourceProvince == "澳门特别行政区"){
+            this.deptBudgetList.sourceArea = "特别行政区"
+          }else{
+             this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
+          }
+
           addList(this.deptBudgetList)
             .toPromise()
             .then((response) => {

src/views/contractManagement/purchaseContractEdit.vue

@@ -419,10 +419,10 @@
           <h3>流程信息</h3>
         </div>
         <ws-info-table>
-          <ws-form-item label="合同收入（元）" span="1" prop="goodsNameKey">
+          <ws-form-item label="已付款（元）" span="1" prop="mildewGrain">
             <ws-input
-              v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
-              placeholder="请输入合同收入（元）"
+              v-model="deptBudgetList.contractProcessInfo.mildewGrain"
+              placeholder="请输入已付款（元）"
               maxlength="100"
               size="small"
             />
@@ -451,14 +451,7 @@
               size="small"
             />
           </ws-form-item>
-          <ws-form-item label="未回款（元）" span="1" prop="mildewGrain"
-            ><ws-input
-              v-model="deptBudgetList.contractProcessInfo.mildewGrain"
-              placeholder="请输入已完成发货量（吨）"
-              maxlength="100"
-              size="small"
-            />
-          </ws-form-item>
+
           <ws-form-item
             label="已完成发运量（吨）"
             span="1"
@@ -651,20 +644,31 @@ export default {
           }
           var tmp = []
           tmp[0] = TextToCode[response.sourceProvince].code
+
           tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
-          tmp[2] =
-            TextToCode[response.sourceProvince][response.sourceCity][
-              response.sourceArea
-            ].code
+
+          if (tmp[0] == 810000 || tmp[0] == 820000) {
+            tmp[2] = null
+          } else {
+            tmp[2] =
+              TextToCode[response.sourceProvince][response.sourceCity][
+                response.sourceArea
+              ].code
+          }
           this.selectedOptions = tmp
           var tmp1 = []
           tmp1[0] = TextToCode[response.deliveryProvince].code
           tmp1[1] =
             TextToCode[response.deliveryProvince][response.deliveryCity].code
-          tmp1[2] =
-            TextToCode[response.deliveryProvince][response.deliveryCity][
-              response.deliveryArea
-            ].code
+
+          if (tmp1[0] == 810000 || tmp1[0] == 820000) {
+            tmp1[2] = null
+          } else {
+            tmp1[2] =
+              TextToCode[response.deliveryProvince][response.deliveryCity][
+                response.deliveryArea
+              ].code
+          }
           this.selectedOptions1 = tmp1
           this.deptBudgetList = response
           if (this.deptBudgetList.deliverType == 1) {
@@ -1296,19 +1300,24 @@ export default {
       }
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
-          this.deptBudgetList.sourceProvince =
-            CodeToText[this.selectedOptions[0]]
+          this.deptBudgetList.sourceProvince = CodeToText[this.selectedOptions[0]]
           this.deptBudgetList.sourceCity = CodeToText[this.selectedOptions[1]]
-          this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
-          this.deptBudgetList.deliveryProvince =
-            CodeToText[this.selectedOptions1[0]]
-          this.deptBudgetList.deliveryCity =
-            CodeToText[this.selectedOptions1[1]]
-          this.deptBudgetList.deliveryArea =
-            CodeToText[this.selectedOptions1[2]]
+         
+          this.deptBudgetList.deliveryProvince = CodeToText[this.selectedOptions1[0]]
+          this.deptBudgetList.deliveryCity = CodeToText[this.selectedOptions1[1]]
+        
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 2
-          console.log(this.deptBudgetList)
+           if(this.deptBudgetList.deliveryProvince =="澳门特别行政区" || this.deptBudgetList.deliveryProvince == "澳门特别行政区"){
+            this.deptBudgetList.deliveryArea = "特别行政区"
+          }else{ 
+                 this.deptBudgetList.deliveryArea =  CodeToText[this.selectedOptions1[2]]
+          }
+             if(this.deptBudgetList.sourceProvince =="澳门特别行政区" || this.deptBudgetList.sourceProvince == "澳门特别行政区"){
+            this.deptBudgetList.sourceArea = "特别行政区"
+          }else{
+               this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
+          }
           editInfo(this.deptBudgetList)
             .toPromise()
             .then((response) => {

src/views/contractManagement/purchaseContractExamine.vue

@@ -108,11 +108,11 @@
         <ws-form-item label="签订日期" span="1" prop="signingDate">
           {{ deptBudgetList.signingDate }}
         </ws-form-item>
-        <ws-form-item label="最终实际交易量(吨)" span="1" prop="TradingVolume">
-          {{ deptBudgetList.sourceRegion }}
+        <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
+          {{ deptBudgetList.finalTradingVolume }}
         </ws-form-item>
-        <ws-form-item label="临时仓库负责人" span="1" prop="sourceRegion">
-          {{ deptBudgetList.sourceRegion }}
+        <ws-form-item label="临时仓库负责人" span="1" prop="personCharge">
+          {{ deptBudgetList.personCharge }}
         </ws-form-item>
       </ws-info-table>
       <!--面试信息-->

src/views/contractManagement/salesContractAdd.vue

@@ -1214,18 +1214,27 @@ export default {
       }
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
-          this.deptBudgetList.sourceProvince =
-            CodeToText[this.selectedOptions[0]]
+          this.deptBudgetList.sourceProvince = CodeToText[this.selectedOptions[0]]
           this.deptBudgetList.sourceCity = CodeToText[this.selectedOptions[1]]
-          this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
-          this.deptBudgetList.deliveryProvince =
-            CodeToText[this.selectedOptions1[0]]
-          this.deptBudgetList.deliveryCity =
-            CodeToText[this.selectedOptions1[1]]
-          this.deptBudgetList.deliveryArea =
-            CodeToText[this.selectedOptions1[2]]
+      
+          this.deptBudgetList.deliveryProvince = CodeToText[this.selectedOptions1[0]]
+          this.deptBudgetList.deliveryCity = CodeToText[this.selectedOptions1[1]]
+         
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 1
+
+           if(this.deptBudgetList.deliveryProvince =="澳门特别行政区" || this.deptBudgetList.deliveryProvince == "澳门特别行政区"){
+            this.deptBudgetList.deliveryArea = "特别行政区"
+          }else{ 
+                
+                this.deptBudgetList.deliveryArea = CodeToText[this.selectedOptions1[2]]
+          }
+             if(this.deptBudgetList.sourceProvince =="澳门特别行政区" || this.deptBudgetList.sourceProvince == "澳门特别行政区"){
+            this.deptBudgetList.sourceArea = "特别行政区"
+          }else{
+              this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
+          }
+
           addList(this.deptBudgetList)
             .toPromise()
             .then((response) => {

src/views/contractManagement/salesContractEdit.vue

@@ -451,7 +451,7 @@
           </ws-form-item>
 
           <!--已开发票（元）-->
-          <ws-form-item label="已开发票（元）" span="1" prop="contractNo">
+          <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.goodsName"
               placeholder="请输入已开发票（元））"
@@ -577,7 +577,7 @@ export default {
   },
   watch: {
     vesselId(val) {
-      this.getVesselData()
+      this.loaddata()
     },
     isShow(val) {
       this.showType = val
@@ -658,6 +658,7 @@ export default {
       this.dialogViewSpareMoney = false
     },
     returnsales() {
+      this.deptBudgetList = {}
       this.$router.push({ path: 'salesContract' })
     },
     handleChange(value) {
@@ -674,22 +675,30 @@ export default {
           var tmp = []
           tmp[0] = TextToCode[response.sourceProvince].code
           tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
-          tmp[2] =
-            TextToCode[response.sourceProvince][response.sourceCity][
-              response.sourceArea
-            ].code
+          if (tmp[0] == 810000 || tmp[0] == 820000) {
+            tmp[2] = null
+          } else {
+            tmp[2] =
+              TextToCode[response.sourceProvince][response.sourceCity][
+                response.sourceArea
+              ].code
+          }
           this.selectedOptions = tmp
           var tmp1 = []
           tmp1[0] = TextToCode[response.deliveryProvince].code
           tmp1[1] =
             TextToCode[response.deliveryProvince][response.deliveryCity].code
-          tmp1[2] =
-            TextToCode[response.deliveryProvince][response.deliveryCity][
-              response.deliveryArea
-            ].code
+          if (tmp1[0] == 810000 || tmp1[0] == 820000) {
+            tmp1[2] = null
+          } else {
+            tmp1[2] =
+              TextToCode[response.deliveryProvince][response.deliveryCity][
+                response.deliveryArea
+              ].code
+          }
+
           this.selectedOptions1 = tmp1
           this.deptBudgetList = response
-          
         })
       // 包装方式
       packList({ constId: 'CON1' })
@@ -726,10 +735,10 @@ export default {
       })
         .toPromise()
         .then((response) => {
-          if(this.deptBudgetList.deliverType == 1){
-            this.deptBudgetList.deliverType1 = "我方自提"
-          }else if(this.deptBudgetList.deliverType == 2){
-            this.deptBudgetList.deliverType1 = "对方送货" 
+          if (this.deptBudgetList.deliverType == 1) {
+            this.deptBudgetList.deliverType1 = '我方自提'
+          } else if (this.deptBudgetList.deliverType == 2) {
+            this.deptBudgetList.deliverType1 = '对方送货'
           }
           this.unitList = response
           let currItem
@@ -1293,19 +1302,37 @@ export default {
           this.deptBudgetList.sourceProvince =
             CodeToText[this.selectedOptions[0]]
           this.deptBudgetList.sourceCity = CodeToText[this.selectedOptions[1]]
-          this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
+
           this.deptBudgetList.deliveryProvince =
             CodeToText[this.selectedOptions1[0]]
           this.deptBudgetList.deliveryCity =
             CodeToText[this.selectedOptions1[1]]
-          this.deptBudgetList.deliveryArea =
-            CodeToText[this.selectedOptions1[2]]
+
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 1
+
+          if (
+            this.deptBudgetList.deliveryProvince == '澳门特别行政区' ||
+            this.deptBudgetList.deliveryProvince == '澳门特别行政区'
+          ) {
+            this.deptBudgetList.deliveryArea = '特别行政区'
+          } else {
+            this.deptBudgetList.deliveryArea =
+              CodeToText[this.selectedOptions1[2]]
+          }
+          if (
+            this.deptBudgetList.sourceProvince == '澳门特别行政区' ||
+            this.deptBudgetList.sourceProvince == '澳门特别行政区'
+          ) {
+            this.deptBudgetList.sourceArea = '特别行政区'
+          } else {
+            this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
+          }
           editInfo(this.deptBudgetList)
             .toPromise()
             .then((response) => {
               this.$message.success('编辑成功')
+              this.deptBudgetList = {}
               this.$router.push({ path: 'salesContract' })
             })
         } else {

src/views/contractManagement/salesContractExamine.vue

@@ -155,10 +155,9 @@
           </ws-form-item>
           
           <ws-form-item label="交货地详细地址" span="1" prop="placeDelivery">
-            <div classs="unchanged">
+            <div class = "unchanged">
                 {{deptBudgetList.placeDelivery}}
             </div>
-
           </ws-form-item>
           <ws-form-item label="签订日期" span="1" prop="signingDate">
             <div class="unchanged">
@@ -286,12 +285,13 @@
         </ws-info-table>
         <div class="remark">
           <h3>备注信息</h3>
+          <div class=" beizhu">
+          {{ deptBudgetList.remarks }}
         </div>
 
-        <div class="unchanged beizhu">
-          {{ deptBudgetList.remarks }}
         </div>
 
+        
         <img :src="deptBudgetList.addressUrl" alt="" />
 
         <!-- </base-card> -->
@@ -311,18 +311,17 @@
 
 <script>
 import {
-  getList,
   packList,
-  addList,
   xiala,
-  addxiala,
-  editxiala,
-  delxiala,
   examineList,
 } from '@/model/contarct/index'
 import { dayjs } from 'base-core-lib'
+import WsUpload from '@/components/WsUpload'
 export default {
   name: 'viewSpareMoney',
+  components: {
+    WsUpload,
+  },
   watch: {
     vesselId(val) {
       this.getVesselData()
@@ -362,7 +361,7 @@ export default {
     this.status = this.$route.query.status
     this.loaddata()
     this.showType = this.isShow
-    this.examineList()
+    // this.examineList()
   },
   methods: {
     loaddata() {
@@ -700,10 +699,11 @@ export default {
 /deep/el-date-editor--date {
   width: 200px;
 }
-.beizhu {
-  position: absolute;
-
+/deep/.beizhu {
   margin: 0 auto;
+  font-size: 14px;
+  color: #afb5cb;
+  margin-left: 20px;
 }
 .unchanged {
   position: absolute;

src/views/tranManagement/tranManagementDriver.vue

@@ -1,7 +1,7 @@
 <!--司机管理-->
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="20">
+    <BaseHeaderLayout :leftSpan="12">
       <template slot="right">
         <ws-button type="primary" @click="handleAdd()">添加</ws-button>
       </template>
@@ -19,6 +19,10 @@
             :value="item.label"
           />
         </ws-select> -->
+        <span style="display: inline-block; width: 60px; color: #8890b1"
+          >城市</span
+        >
+
         <el-cascader
           :options="options_"
           v-model="searchTypeText"
@@ -36,6 +40,22 @@
           type="input"
           class="findValue"
         ></ws-input>
+
+        <ws-button type="primary" @click="handleLook()">
+          <img
+            width="14"
+            height="16"
+            style="
+              vertical-align: text-top;
+              position: relative;
+              top: 0px;
+              left: -8px;
+            "
+            src="../../../public/img/sousuo.png"
+            alt=""
+          />
+        </ws-button>
+
         <ws-button type="primary" @click="handleLook()">查找</ws-button>
       </template>
     </BaseHeaderLayout>
@@ -686,6 +706,10 @@ export default {
 /deep/.el-icon-arrow-right {
   display: none;
 }
+
+/deep/.el-pagination{
+  text-align: center;
+}
 .ws-info-table {
   border-left: 1px solid #e9ecf7;
   border-top: 1px solid #e9ecf7;

src/views/tranManagement/tranManagementDriverAdd.vue

@@ -106,7 +106,27 @@
         v-for="(item, index) in freightspace"
       >
         <div class="trucks">
-          <div class="driver">货车信息-{{ index + 1 }}</div>
+          <div class="driver">
+            <span class="driver">货车信息-{{ index + 1 }}</span>
+            
+            <img
+              width="22"
+              height="22"
+              class="add"
+              @click="add"
+              src="../../../public/img/add.png"
+              alt=""
+            />
+            <img
+              width="22"
+              height="22"
+              class="del"
+              @click="del(index)"
+              src="../../../public/img/del.png"
+              alt=""
+            />
+          </div>
+
           <ws-info-table class="el-table">
             <!--车牌号-->
             <ws-form-item
@@ -188,22 +208,6 @@
               />
             </ws-form-item>
           </ws-info-table>
-          <img
-            width="22"
-            height="22"
-            class="add"
-            @click="add"
-            src="../../../public/img/add.png"
-            alt=""
-          />
-          <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del(index)"
-            src="../../../public/img/del.png"
-            alt=""
-          />
         </div>
       </div>
     </ws-form>
@@ -219,7 +223,25 @@
         v-for="(item, index) in freightspace1"
       >
         <div class="gathering">
-          <div class="driver">收款人账户信息-{{ index + 1 }}</div>
+          <div class="driver">
+        收款人账户信息-{{ index + 1 }}
+            <img
+              width="22"
+              height="22"
+              class="add"
+              @click="add1"
+              src="../../../public/img/add.png"
+              alt=""
+            />
+            <img
+              width="22"
+              height="22"
+              class="del"
+              @click="del1(index)"
+              src="../../../public/img/del.png"
+              alt=""
+            />
+          </div>
           <ws-info-table class="el-table">
             <!--账户类型-->
             <ws-form-item
@@ -375,22 +397,6 @@
               </ws-select>
             </ws-form-item>
           </ws-info-table>
-          <img
-            width="22"
-            height="22"
-            class="add"
-            @click="add1"
-            src="../../../public/img/add.png"
-            alt=""
-          />
-          <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del1(index)"
-            src="../../../public/img/del.png"
-            alt=""
-          />
         </div>
       </div>
     </ws-form>
@@ -978,16 +984,21 @@ export default {
 <style lang="scss" scoped>
 .position {
   position: relative;
+  background: #f6f7fc;
+  height: 124px;
+  margin-top: 20px;
+  border: 1px solid #D8DCE6;
+  border-radius: 3px;
 }
 .add,
 .del {
   position: absolute;
-  right: -38px;
-  top: 9px;
+  top: 10px;
   cursor: pointer;
+  margin-left: 17px;
 }
 .del {
-  right: -70px;
+  margin-left: 50px;
 }
 .amap-page-container {
   width: 300px;
@@ -1098,7 +1109,9 @@ export default {
   height: 93vh;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 80px;
+  // width: 110px;
+  width: 40%;
+  text-align: center;
 }
 /deep/.ws-info-table .el-form-item {
   width: 25%;
@@ -1125,20 +1138,28 @@ export default {
   width: 20%;
 }
 .el-form-item.el-car.el-form-item--small {
-  width: 33.3%;
+  width: 33.33%;
+  border-top: 1px solid #D8DCE6;
+  border-bottom: 0px;
+  background: #F6F7FC;
 }
 .trucks {
   color: #69708c;
   border: 1px solid #d8dce6;
-  width: 90%;
   padding: 12px;
   border-radius: 3px;
   margin: 10px 0;
+  border: 0px;
+  font-size: 14px;
+  color: #8890b1;
+  width: 100%;
 }
 /deep/.trucks .ws-info-table,
 /deep/.trucks .ws-info-table .el-form-item,
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__content {
   border: none;
+  background: #f6f7fc;
+  border-radius: 4px;
 }
 /deep/.trucks .el-table__expanded-cell,
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__label,
@@ -1153,28 +1174,34 @@ export default {
 }
 .gathering {
   background: #f5f7fa;
-  border: 1px solid #d8dce6;
-  border-radius: 3px;
-  width: 90%;
+  
 }
 /deep/.gathering .ws-info-table {
   border-left: none;
-  border-top: 1px solid #d8dce6;
+  border: none;
 }
 /deep/.gathering .driver {
   padding: 10px;
 }
+.driver {
+  color: #5473e8;
+  line-height: 20px;
+  font-size: 14px;
+}
 /deep/.gathering .el-form-item .el-form-item__label {
   background: #f5f7fa;
   text-align: center;
+  border-right: 1px solid #D8DCE6;
+  width: 140px;
 }
 /deep/.gathering .ws-info-table .el-form-item .el-form-item__content {
-  border-left: 1px solid #d8dce6;
+  border:none;
+  background: #F6F7FC;
 }
 /deep/.gathering .ws-info-table .el-form-item.compname,
 /deep/.gathering .ws-info-table .el-form-item.bankDeposit,
 /deep/.gathering .ws-info-table .el-form-item.bankDeposit1 {
-  border-right: 1px solid transparent;
+  border:none;
 }
 /deep/.gathering .ws-info-table .el-form-item.compname {
   width: 100%;

src/views/tranManagement/tranManagementDriverEdit.vue

@@ -105,7 +105,24 @@
         v-for="(item, index) in deptBudgetList.driverCarInfoList"
       >
         <div class="trucks">
-          <div class="driver">货车信息-{{ index + 1 }}</div>
+          <div class="driver">货车信息-{{ index + 1 }}
+             <img
+            width="22"
+            height="22"
+            class="add"
+            @click="add"
+            src="../../../public/img/add.png"
+            alt=""
+          />
+          <img
+            width="22"
+            height="22"
+            class="del"
+            @click="del(item, index)"
+            src="../../../public/img/del.png"
+            alt=""
+          />
+          </div>
           <ws-info-table class="el-table">
             <!--车牌号-->
             <ws-form-item
@@ -192,22 +209,7 @@
               />
             </ws-form-item>
           </ws-info-table>
-          <img
-            width="22"
-            height="22"
-            class="add"
-            @click="add"
-            src="../../../public/img/add.png"
-            alt=""
-          />
-          <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del(item, index)"
-            src="../../../public/img/del.png"
-            alt=""
-          />
+         
         </div>
       </div>
     </ws-form>
@@ -223,7 +225,24 @@
         v-for="(item, index) in deptBudgetList.driverPayeeInfoList"
       >
         <div class="gathering">
-          <div class="driver">收款人账户信息-{{ index + 1 }}</div>
+          <div class="driver">收款人账户信息-{{ index + 1 }}
+             <img
+            width="22"
+            height="22"
+            class="add"
+            @click="add1"
+            src="../../../public/img/add.png"
+            alt=""
+          />
+          <img
+            width="22"
+            height="22"
+            class="del"
+            @click="del1(item, index)"
+            src="../../../public/img/del.png"
+            alt=""
+          />
+          </div>
           <ws-info-table class="el-table">
             <!--账户类型-->
             <ws-form-item
@@ -379,22 +398,7 @@
               </ws-select>
             </ws-form-item>
           </ws-info-table>
-          <img
-            width="22"
-            height="22"
-            class="add"
-            @click="add1"
-            src="../../../public/img/add.png"
-            alt=""
-          />
-          <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del1(item, index)"
-            src="../../../public/img/del.png"
-            alt=""
-          />
+         
         </div>
       </div>
     </ws-form>
@@ -883,12 +887,12 @@ export default {
 .add,
 .del {
   position: absolute;
-  right: -38px;
-  top: 9px;
+ margin-left: 23px;
+  top: 27px;
   cursor: pointer;
 }
 .del {
-  right: -70px;
+  margin-left: 70px;
 }
 .el-form {
   padding: 0 10%;
@@ -935,7 +939,6 @@ export default {
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   padding: 0 25px;
   border-left: 1px solid #cdd2dc;
-  background: #fafbfc;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 140px;
@@ -1010,9 +1013,6 @@ export default {
 .el-form-item__label {
   text-align: center;
 }
-.el-table {
-  width: 1240px;
-}
 .ce {
   width: 900px;
   margin: 0 auto;
@@ -1062,15 +1062,16 @@ export default {
   width: 20%;
 }
 .el-form-item.el-car.el-form-item--small {
-  width: 33.3%;
+  width: 33.333%;
 }
 .trucks {
   color: #69708c;
   border: 1px solid #d8dce6;
-  width: 90%;
+  width: 100%;
   padding: 12px;
   border-radius: 3px;
   margin: 10px 0;
+  background: #F6F7FC;
 }
 /deep/.trucks .ws-info-table,
 /deep/.trucks .ws-info-table .el-form-item,
@@ -1080,7 +1081,7 @@ export default {
 /deep/.trucks .el-table__expanded-cell,
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__label,
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__content {
-  background: transparent;
+  background: #F6F7FC;
 }
 /deep/.trucks .ws-info-table .el-form-item .el-form-item__label {
   color: #8890b1;
@@ -1092,7 +1093,8 @@ export default {
   background: #f5f7fa;
   border: 1px solid #d8dce6;
   border-radius: 3px;
-  width: 90%;
+  width: 100%;
+  margin-top: 15px;
 }
 /deep/.gathering .ws-info-table {
   border-left: none;
@@ -1162,7 +1164,7 @@ export default {
   line-height: 16px;
   position: absolute;
   right: -50px;
-  top: 44px;
+  top: 6px;
   border: 1px solid #ccc;
   padding: 5px 10px;
   border-radius: 20px;

src/views/tranManagement/tranManagementDriverLook.vue

@@ -33,13 +33,7 @@
             prop="contractNo"
             class="readonly bg-right"
           >
-            <ws-input
-              disabled
-              v-model="deptBudgetList.driverName"
-              placeholder="请输入司机姓名"
-              maxlength="20"
-              size="small"
-            />
+            {{deptBudgetList.driverName}}
           </ws-form-item>
           <!--手机号-->
           <ws-form-item
@@ -48,13 +42,7 @@
             prop="driverPhone"
             class="readonly"
           >
-            <ws-input
-              disabled
-              v-model="deptBudgetList.driverPhone"
-              placeholder="请输入手机号"
-              maxlength="100"
-              size="small"
-            />
+            {{deptBudgetList.driverPhone}}
           </ws-form-item>
 
           <!--常驻城市-->
@@ -70,13 +58,7 @@
             prop="driverNo"
             class="readonly"
           >
-            <ws-input
-              disabled
-              v-model="deptBudgetList.numberCard"
-              placeholder="请输入身份证号"
-              maxlength="100"
-              size="small"
-            />
+            {{deptBudgetList.numberCard}}
           </ws-form-item>
         </ws-info-table>
         <span v-if="age && age < 60" class="small">{{ age }}岁</span>
@@ -550,7 +532,7 @@ export default {
   background: #f5f7fa;
   color: #69708c;
   border: 1px solid #d8dce6;
-  width: 90%;
+  width: 100%;
   padding: 12px;
   border-radius: 3px;
 }
@@ -564,8 +546,8 @@ export default {
   background: #f5f7fa;
   border: 1px solid #d8dce6;
   border-radius: 3px;
-  width: 90%;
-  border-bottom: 1px solid transparent;
+  border-bottom: 1px solid #d8dce6;
+  height: 125px;
 }
 /deep/.gathering .ws-info-table {
   border-left: none;
@@ -615,6 +597,7 @@ export default {
 }
 .drivermessage .ws-info-table {
   border: none;
+  width: 100%;
 }
 /deep/.drivermessage .ws-info-table .el-form-item__label {
   background: #fff;
@@ -622,14 +605,16 @@ export default {
 }
 /deep/.drivermessage .ws-info-table .el-form-item__content,
 /deep/.drivermessage .ws-info-table .el-form-item {
-  border: none;
+  background: #F5F7FA;
+border-radius: 5px;
+border: none;
 }
 .small,
 .big {
   color: #ccc;
   line-height: 16px;
   position: absolute;
-  right: -50px;
+  right: -60px;
   top: 5px;
   border: 1px solid #ccc;
   padding: 5px 10px;

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -6,19 +6,19 @@
         <ws-button
         class="but"
           type="primary"
-          @click="handleAdd()"
+          @click="handlestatus(1)"
           >
           执行中</ws-button
         >
         <ws-button
         class="but"
-          @click="appp()"
+          @click="handlestatus(1)"
           
           >已完成</ws-button
         >
         <ws-button
         class="but"
-          @click="handleEdit()"
+          @click="handlestatus('')"
           
           >全部任务</ws-button
         > 
@@ -154,29 +154,30 @@
       <el-table-column class="table_td" label="接单日期" prop="receivingDate">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
-          <template slot-scope="scope">
-            <div
-              class="completed"
-              @click="trainSee(scope.row)"
-            >
-            查看
+            <template slot-scope="scope">
+            <div class="record" @click="trainSee(scope.row)">
+              查看
             </div>
-            <div
-              class="putstorage"
-              @click="feedback(scope.row)"
+            <div class="adjustment" @click="feedback(scope.row)"
               v-show="scope.row.tranType == '汽运'"
             >
-            反馈
+              反馈
             </div>
-            </template>
-        </el-table-column>
-        <!-- <el-table-column prop="address" label="操作" width="200">
-          <template slot-scope="scope">
-            <div class="record" @click="record(scope.row)">记录</div>
-            <div class="adjustment" @click="loss(scope.row)">盘损</div>
           </template>
-        </el-table-column> -->
+        </el-table-column>
       </el-table>
+      <div>
+        <!-- 分页 -->
+      <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>
   </div>
 </template>
@@ -228,11 +229,14 @@ export default {
       size: 10,
       spanArr: [],
       warehouseName: '',
+      deptBudgetTotal: 0,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       warehouseList: [],
       deptBudgetList: {},
       historyList: [],
+      value2:'',
+      pickerOptions:[],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -242,7 +246,6 @@ export default {
     }
   },
   mounted(){
-    console.log(11111)
     this.getList()
   },
   methods: {
@@ -258,12 +261,14 @@ export default {
         .toPromise()
         .then((response) => {
           this.warehouseList = response
+          // this.deptCircularPage.currentPage = response.current
+          // this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
         })
     },
-    handleAdd(){
-        this.$router.push({
-            path: 'tranManagementReceivingloading',
-        })
+    handlestatus(){
+      this.searchType = status
+      this.getList()
     },
     delivery(item) {
       this.$router.push({
@@ -544,4 +549,5 @@ export default {
     height: 32px;
     margin-left: -20%;
 }
+ 
 </style>

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -1,4 +1,4 @@
-// 汽运卸车反馈
+// 汽车卸车
 <template>
   <div class="container">
     <el-row>
@@ -22,147 +22,151 @@
       </el-col>
     </el-row>
     <div class="center">
-    <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
-      <div class="basicInformation">
-        <h2> 任务编号 </h2>
-        <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">
-          
-          {{deptBudgetList.sender}}
-          </ws-form-item>
+      <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
+        <div class="basicInformation">
+          <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">
+              {{ deptBudgetList.goodsName }}
+            </ws-form-item>
+            <!--重量（吨）-->
+            <ws-form-item
+              label="重量（吨）"
+              span="1"
+              prop="tare"
+              class="readonly"
+            >
+              {{ deptBudgetList.weight }}
+            </ws-form-item>
 
-          <!--发货人电话-->
-          <ws-form-item label="发货人电话" span="1" prop="senderPhone">
-            
-            {{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="netWeight">
+              {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
+              }}{{ deptBudgetList.sendArea
+              }}{{ deptBudgetList.sendDetailedAddress }}
+            </ws-form-item>
+            <!--发货人-->
+            <ws-form-item label="发货人" span="1" prop="agent">
+              {{ deptBudgetList.sender }}
+            </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 label="发货人电话" span="1" prop="agent">
+              {{ deptBudgetList.senderPhone }}
+            </ws-form-item>
+            <!--收货地址-->
+            <ws-form-item label="收货地址" span="1" prop="netWeight">
+              {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
+              }}{{ deptBudgetList.receiveArea
+              }}{{ deptBudgetList.receiveDetailedAddress }}
+            </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="inOutDate"
+              class="deliverydate"
+            >
+              {{ deptBudgetList.deliveryDateStart }}
+            </ws-form-item>
+            <!--最晚发货日期-->
+            <ws-form-item
+              label="最晚发货日期"
+              span="1"
+              prop="inOutDate"
+              class="deliverydate"
+            >
+              {{ 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-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"><h2>卸车详情</h2></div>
-        <div class="liaison">
-        <div
-          style="width: 100%"
-          class="flex position"
-          v-for="(item, index) in this.freightspace"
-          :key="index"
-        >
-          <ws-info-table>
-            <!--司机-->
-            <ws-form-item :label="'司机' + (index + 1)" span="1" prop="driver">
-               <el-input
-                v-show="item.temporaryDriverFlag != 0"
-                v-model="item.driver"
-                placeholder="请选择司机"
-                filterable
-                :filter-method="dataFilter"
-                @change="selectstaff"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.staffName"
-                  :value="item.staffName"
-                />
-               </el-input> 
-               <span v-show="item.temporaryDriverFlag == 0">{{item.driver}} </span> 
-                   
+          </ws-info-table>
+
+          <div class="small-title" style="font-size: 16px">卸车详情</div>
+
+          <div
+            class="driver position liaison"
+            v-for="(item, index) in deptBudgetList.tranCarInfoList"
+          >
+            <ws-info-table>
+              <div class="catNos" v-show="item.temporaryDriverFlag == 0">司机-{{index+1}}</div>
+             <div class="catNos catNosCor" v-show="item.temporaryDriverFlag != 0">司机-{{index+1}}(临)</div>
+              <!--司机-->
+              <ws-form-item
+              label="姓名："
+              span="1"
+              prop="driver"
+            >
+              <span v-show="item.temporaryDriverFlag == 0"
+                >
+                {{ item.driver }}
+              </span>
             </ws-form-item>
-            <!--电话-->
-            <ws-form-item label="司机电话" span="1" prop="driverPhone">
-               <ws-input
-               v-show="item.temporaryDriverFlag != 0"
+              <!--电话-->
+            <ws-form-item label="电话：" span="1" prop="driverPhone">
+              <!-- <ws-input
+                v-show="item.temporaryDriverFlag != 0"
                 v-model="item.driverPhone"
-                placeholder="请输入司机电话"
                 maxlength="20"
                 size="small"
-              /> 
-             <span v-show="item.temporaryDriverFlag == 0">{{item.driverPhone}} </span> 
+              /> -->
+              <span v-show="item.temporaryDriverFlag == 0"
+                >{{ item.driverPhone }}
+              </span>
             </ws-form-item>
-            <!--车牌号-->
-            <ws-form-item label="车牌号" span="1" prop="carNo">
-               <ws-input
-               v-show="item.temporaryDriverFlag != 0"
+              <!--车牌号-->
+            <ws-form-item label="车牌号：" span="1" prop="carNo">
+              <!-- <ws-input
+                v-show="item.temporaryDriverFlag != 0"
                 v-model="item.carNo"
-                placeholder="请输入车牌号"
                 maxlength="20"
                 size="small"
-              /> 
-             <span v-show="item.temporaryDriverFlag == 0">{{item.carNo}} </span> 
+              /> -->
+              <span v-show="item.temporaryDriverFlag == 0"
+                >{{ item.carNo }}
+              </span>
             </ws-form-item>
-            <!--装车净重-->
-            <ws-form-item label="装车(吨)" span="1" prop="loadNetWeight">
-              <ws-input
+              <!--装车净重-->
+            <ws-form-item label="装车(吨)：" span="1" prop="loadNetWeight">
+              <!-- <ws-input
                 v-model="item.loadNetWeight"
-                placeholder="请输入装车净重"
+                placeholder="请输入装车(吨)"
                 maxlength="20"
                 size="small"
-              />
+              /> -->
+              {{item.loadNetWeight}}
             </ws-form-item>
-            <!--卸车净重(吨)-->
-            <ws-form-item label="卸车净重(吨)" span="1" prop="unloadNetWeight">
+              <!--卸车净重(吨)-->
+            <ws-form-item label="卸车净重(吨)：" span="1" prop="unloadNetWeight">
               <ws-input
                 v-model="item.unloadNetWeight"
-                placeholder=""
+                placeholder="请输入卸车净重"
                 maxlength="20"
                 size="small"
               />
             </ws-form-item>
-            <!--磅单-->
-            <ws-form-item label="磅单" span="1" prop="loadPoundImg">
+              <!--磅单-->
+            <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
-              
                 <img
                   width="18"
                   height="20"
@@ -175,52 +179,59 @@
                   @click="fujian(scope.row)"
                   alt=""
                 />
-                <span v-show="item.temporaryDriverFlag == 0" >{{item.signStatus}}</span>
+                <div v-show="item.temporaryDriverFlag == 0">
+                  {{ item.signStatus }}
+                </div>
               </template>
             </ws-form-item>
-          </ws-info-table>
+            </ws-info-table>
+            <!-- <span
+              v-show="!item.temporaryDriverFlag"
+              width="22"
+              height="22"
+              class="del"
+              @click="del(index)"
+              src="../../../public/img/del.png"
+              alt=""
+              >×</span
+            > -->
+          </div>
+          <div style="text-align: right; color: #8890b1; font-size: 16px">
+            合计{{ total }}/{{ deptBudgetList.weight }}
+          </div>
+          <!-- <el-button class="add" type="primary" size="small" @click="add()">
+             <img
+                width="22"
+                height="22"
+                @click="add"
+                src="../../../public/img/add.png"
+                alt=""
+              />
+             <div class="spans">添加司机</div>
+            </el-button
+          > -->
+          <div style="text-align: right; padding: 10px">
+            <el-button
+              class="bg-bottom-up"
+              type="primary"
+              size="small"
+              @click="submit()"
+            >提交</el-button
+            >
+          </div>
         </div>
-      </div>
-      </div>
-    </ws-form>
-    <div style="text-align: right; padding: 10px">
-        <el-button
-          class="bg-bottom-up"
-          type="primary"
-          size="small"
-          @click="submit(deptBudgetList)"
-          >提交</el-button
-        >
-      </div>
-      <WinseaContentModal
-      v-model="accessoryTFs"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose"
-    >
-      <p>上传附件</p>
-      <ws-upload
-        ref="upload"
-        table-name="maintain_work_order"
-        oss-key="mainPlan"
-        :comp-id="compId"
-        :file-list="fileList"
-        :appendix-ids="appendixIdsAdd"
-        :vesselId="deptBudgetList.loadPoundImg"
-        :size-limit="size"
-        @uploadSuccess="uploadSuccess"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
-      />
-    </WinseaContentModal>
+      </ws-form>
     </div>
   </div>
-  
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import {seeCat, packList, feedback} from '@/model/transport/index'
-import{getstaff}from '@/model/warehouse/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
+import {
+  seeCat,
+  packList,
+  feedback
+} from '@/model/transport/index'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'
 export default {
@@ -239,40 +250,19 @@ export default {
   },
   data() {
     return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
       // 是否显示
       showType: true,
-      // 年
-      year: '',
-      item:[],
-      shipType:[],
-      tranType: 3,
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
       searchType: 1,
-      searchKeyWord: '',
-      contractType: 2,
       startDate: null,
       endDate: null,
-      goodnameList: {},
+      carList: [],
       // 提交类型
-      submitType: true,
-      storageType: [],
       readonly: true,
       appendixIdsAdd: '',
-      uploadSuccess: {},
       onChange: {},
-      selectedOptions: [],
-        options:[],
-      tranCarInfoList: {},
-        staffList :[],
       gradeList: [],
       rules: {
         netWeight: [
@@ -284,15 +274,6 @@ export default {
           },
         ],
       },
-      fileList:[],
-     freightspace: [
-        {
-          driver: '',
-          driverPhone: '',
-          carNo: '',
-          loadNetWeight: '',
-        },
-      ],
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
@@ -303,10 +284,9 @@ export default {
       },
       contractList: [],
       deptBudgetList: {
-        warehouseInOutDetail: {},
+        tranCarInfoList: [],
       },
       historyList: [],
-
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -315,119 +295,59 @@ export default {
       accessoryTFs: false,
     }
   },
-  mounted() {
-    this.deptBudgetList.id = this.$route.query.id
+  activated() {
     this.getList()
   },
-//  activated(){
-//    this.loaddata()
-//    this.getList()
-//  },
- computed: {
-    totalStorage: function () {
+  computed: {
+    total: function () {
       var maxStorage = 0
-      for (var i = 0; i < this.freightspace.length; i++) {
-        maxStorage += Number(this.freightspace[i].maxStorage)
+      for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+        maxStorage += Number(this.deptBudgetList.tranCarInfoList[i].loadWeight)
       }
       return maxStorage
     },
   },
+  mounted() {
+    this.deptBudgetList.id = this.$route.query.id
+    this.getList()
+  },
   methods: {
-   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
-            }
-          }
-        })
-    },
-    dataFilter(val) {
-      this.deptBudgetList.personCharge = val
-      if (val) {
-        console.log(val)
-        this.options = this.staffList.filter((item) => {
-          if (
-            !!~item.staffName.indexOf(val) ||
-            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
-          }
-        })
-      } else {
-        this.options = this.staffList
-      }
-    },
-    selectstaff(e) {
-      for (var i = 0; i < this.staffList.length; i++) {
-        if (this.staffList[i].staffName == e) {
-          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
-          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
-        }
-      }
-    },
-    // loaddata() {
-    //   dispatchCat({ id: this.deptBudgetList.id  })
-    //     .toPromise()
-    //     .then((response) => {
-    //       this.deptBudgetList = response
-    //         this.freightspace = response.tranCarInfoList
-    //         for (var i = 0; i < this.freightspace.length; i++) {
-    //         if (!this.freightspace[i].loadNetWeight) {
-    //           this.freightspace[i].loadNetWeight = 0
-    //         }
-    //       }
-        //   for(var i = 0; i<this.deptBudgetList.tranCarInfoList.length;i++){
-        //    var num  = this.deptBudgetList.tranCarInfoList[i].positionWeight.split("," )  
-        //    for(var j = 0;j<num.length;j++){
-        //     var num2 = num[j].split("/")
-        //      this.freightspace.push({
-        //        'impurity': num2[i],
-        //        'positionWeight':num2[num2.length-1]
-        //      })
-        //    }
-
-        //   }
-  //   })
-  // },
-  //上传
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
     //返回按钮
     revert() {
-      this.freightspace=[]
       this.$router.push({ path: 'tranManagementReceivingFeedback' })
     },
-    
-    selectdriver() {},
-    handleChange(value) {
-      this.selectedOptions = value
-    },
-    returnsales() {
-      this.deptBudgetList = {}
-      this.freightspace = {}
-      this.selectedOptions = ''
-      this.$router.push({ path: 'tranManagementReceivingFeedback' })
+    del(index) {
+      if (this.deptBudgetList.tranCarInfoList.length > 1) {
+        this.deptBudgetList.tranCarInfoList.splice(index, 1)
+      }
     },
+    // add() {
+    //   console.log(this.deptBudgetList.tranCarInfoList, 'sasasasas')
+    //   this.deptBudgetList.tranCarInfoList.push({
+    //     driverName: '',
+    //     driverPhone: '',
+    //     carLength: 0,
+    //     carLengthKey: '',
+    //     loadWeight: null,
+    //     carModel: '',
+    //     carModelKey: '',
+    //     carNumber: '',
+    //     disabled: false,
+    //     tranType: '1',
+    //   })
+    // },
+    selectwaterContent() {},
     //提交按钮
-    submit() { 
+    submit() {
+      for(var i = 0 ; i < this.freightspace.length ; i++){
+          if(this.freightspace[i].unloadNetWeight==null){
+            this.$message({
+              message:"卸重不能为空！",
+              type: "warning"
+            })
+            return
+          }
+        }
       this.$confirm(`所有车辆完成卸车任务后，请及时修改任务状态，确定提交卸车信息？`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -436,38 +356,33 @@ export default {
         .then(() => {
           this.$refs.deptBudgetList.validate((valid) => {
             if (valid) {
-              
-            //  for(var i = 0; i < this.freightspace.length; i++){
-            //    var num  = this.freightspace[i].impurity + "/" + this.freightspace[i].positionWeight
-            //    this.arr.push(
-            //      num
-            //    )  
-            //  }
-          
-            this.tranCarInfoList=this.freightspace
-            this.tranCarInfoList.driver = this.deptBudgetList.driver
+              // this.deptBudgetList.totalStorage = this.totalStorage
+              this.tranCarInfoList = this.freightspace
+              this.tranCarInfoList.driver = this.deptBudgetList.driver
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-              this.tranCarInfoList. carNo = this.deptBudgetList.carNo
-              this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeigh
-              this.tranCarInfoList.unloadNetWeight = this.deptBudgetList.unloadNetWeight
-              this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
-              this.tranCarInfoList.tranType = this.deptBudgetList.tranType
-            for(var i = 0 ; i<this.tranCarInfoList.length;i++){
+              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
-                 }
-            }
+                if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
+                  this.tranCarInfoList[i].temporaryDriverFlag = 1
+                  this.tranCarInfoList[i].tranType = this.tranType
+                }
+              }
               var tranProcessInfo = {}
-              var tranList = this.tranCarInfoList
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.infoId = this.deptBudgetList.infoId
               tranProcessInfo.tranCarInfoList = this.tranCarInfoList
+              // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
               feedback(tranProcessInfo)
                 .toPromise()
                 .then((response) => {
-                  this.$message.success('添加成功')
+                  this.$message.success('提交成功')
                   this.deptBudgetList = {}
                   this.freightspace = {}
                   this.selectedOptions = ''
@@ -485,21 +400,84 @@ export default {
           return false
         })
     },
-    resetForm(deptBudgetList) {
-      this.$refs[deptBudgetList].resetFields()
-    },
+
     handleClose() {
       this.accessoryTFs = false
     },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
+
+   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
+            }
+          }
+        })
+   },
+    carchange(val, index) {
+      for (var i = 0; i < this.carList.length; i++) {
+        if (this.carList[i].driverName == val) {
+          this.deptBudgetList.tranCarInfoList[index].driverPhone =
+            this.carList[i].driverPhone
+          arrange({ id: this.carList[i].id })
+            .toPromise()
+            .then((response) => {
+              console.log(this, response)
+              this.deptBudgetList.tranCarInfoList[index].carNo =
+                response.carNumber
+              if (response.carLoad != null) {
+                this.deptBudgetList.tranCarInfoList[index].loadWeight =
+                  response.carLoad
+              } else {
+                this.deptBudgetList.tranCarInfoList[index].loadWeight = 0
+              }
+              this.deptBudgetList.tranCarInfoList[index].carModel =
+                response.carModel
+              this.deptBudgetList.tranCarInfoList[index].carLength =
+                response.carLength
+              this.deptBudgetList.tranCarInfoList[index].carLengthKey =
+                response.carLengthKey
+              this.deptBudgetList.tranCarInfoList[index].carModelKey =
+                response.carModelKey
+            })
+        }
+      }
+    }
+      
     },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
+    phonechange(val, index) {
+      for (var i = 0; i < this.carList.length; i++) {
+        if (this.carList[i].driverPhone == val) {
+          this.deptBudgetList.tranCarInfoList[index].driver =
+            this.carList[i].driver
+          arrange({ id: this.carList[i].id })
+            .toPromise()
+            .then((response) => {
+              console.log(this, response)
+              this.deptBudgetList.tranCarInfoList[index].carNo =
+                response.carNumber
+              if (response.carLoad != null) {
+                this.deptBudgetList.tranCarInfoList[index].loadWeight =
+                  response.carLoad
+              } else {
+                this.deptBudgetList.tranCarInfoList[index].loadWeight = 0
+              }
+              this.deptBudgetList.tranCarInfoList[index].carModel =
+                response.carModel
+              this.deptBudgetList.tranCarInfoList[index].carLength =
+                response.carLength
+              this.deptBudgetList.tranCarInfoList[index].carLengthKey =
+                response.carLengthKey
+              this.deptBudgetList.tranCarInfoList[index].carModelKey =
+                response.carModelKey
+            })
+        }
+      }
     },
     selecttaskType(e) {
       for (var i = 0; i < this.taskTypeList.length; i++) {
@@ -510,8 +488,8 @@ export default {
     },
     approve() {},
     listQuery() {},
-  },
-}
+  }
+
 </script>
 <style lang="scss" scoped>
 /deep/.basicInformation {
@@ -521,6 +499,7 @@ export default {
   .el-form-item {
     width: 33.3333%;
     border: none;
+    height: 50px;
     .el-form-item__label {
       background: transparent;
       border: none;
@@ -557,8 +536,8 @@ export default {
   text-align: right;
   padding: 16px 20px;
 }
-.center{
-  width: 80%;
+.center {
+  width: 90%;
   margin: 0 auto;
 }
 
@@ -587,77 +566,117 @@ export default {
   top: 13px;
   padding: 4px 2px;
 }
-.position{
-  width: 90%;
-}
-.position .siji{
-  width: 16%;
-}
-/deep/.position .ws-info-table .el-form-item .el-form-item__label{
-  width: 40%;
-  text-align: center;
+.position {
+  position: relative;
 }
-.position .zaizhong{
+.position .zaizhong {
   width: 16%;
 }
 //减号
 .del {
-  right: -70px;
-}
-.bot{
-  width: 30%;
+  position: absolute;
+  // right: -38px;
+  top: 9px;
+  cursor: pointer;
+  right: 0;
+  display: inline-block;
+  font-size: 20px;
+  width: 20px;
+  height: 10px;
+  line-height: 0px;
 }
-.position .siji {
-  width: 20.5%;
+.driver .el-form-item {
+  width: 16.63%;
 }
-/deep/.el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  color: #8890b1;
+  font-size: 14px;
 }
-/deep/.ws-info-table {
-  border-left: 0px;
-  border-top: 0px;
+/deep/.driver .ws-info-table .el-form-item .el-form-item__label {
+  width: 72px;
 }
-.ws-info-table .el-form-item .el-form-item__content {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
+/deep/.liaison .ws-info-table .el-form-item {
+  width: 16.66%;
+  color: #8890b1;
+  font-size: 14px;
 }
 /deep/.ws-info-table .el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-  border-top: 0px;
+ border: none;
+ height: 50px;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__content {
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
+  width: 40%;
+  border: 0px solid #d8dce6;
+  background: #f5f7fa;
+  text-align: center;
+}
+/deep/.liaison {
   background: #f5f7fa;
   border-radius: 4px;
-  border: 1px solid #d8dce6;
-  font-family: PingFangSC-Regular, PingFang SC;
-  margin-bottom: 5px;
-  background-color: #fff;
+  border: 0px solid #d8dce6;
+}
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
+  border: none;
+  background: #f5f7fa;
+}
+.catNos {
+  width: 100%;
+  height: 30px;
+  margin-top: 10px;
+  margin-left: 20px;
   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;
+/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
+  // border: 0px solid #d8dce6;
+  border-radius: 0px;
+  border-left: none;
+  border-bottom: none;
+  border-top: none;
+}
+/deep/.liaison .ws-info-table{
+  background: #F6F7FC;
+border-radius: 4px;
+border: 1px solid #D8DCE6;
+margin-top: 20px;
+}
+//送达/未送达
+.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;
+}
+//添加司机
+.add {
+  width: 100px;
+  height: 34px;
+  background: #f6f7fb;
+  border-radius: 17px;
+  color: #5473e8;
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
+  border: none;
 }
-// .flex .position{
-//   margin-top: 150px;
-//   margin-left: 20px;
-// }
-.position{
-  width: 100%;
+.add img {
+  display: inline-block;
+  margin-top: 3px;
+  margin-left: -12px;
 }
-.position .siji{
-  width: 20.6%;
+.add .spans {
+  display: table-caption;
+  width: 56px;
+  height: 20px;
+  line-height: 18px;
 }
 </style>

src/views/tranManagement/tranManagementShipping.vue

@@ -6,19 +6,19 @@
         <ws-button
         class="but"
           type="primary"
-          @click="handleAdd()"
+          @click="handlestatus(1)"
           >
           执行中</ws-button
         >
         <ws-button
         class="but"
-          @click="app()"
+          @click="handlestatus(2)"
           
           >已完成</ws-button
         >
         <ws-button
         class="but"
-          @click="handleEdit()"
+          @click="handlestatus('')"
           
           >全部任务</ws-button
         > 
@@ -146,19 +146,12 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <div
-              class="record"
-              @click="handleLook(scope.row)"
-              
-            >
+            <ws-button class="completed" @click="handleLook(scope.row)">
               查看
-            </div>
-            <div
-              class="adjustment"
-              @click="shipping(scope.row)"
-            >
+            </ws-button>
+            <ws-button class="putstorage" @click="shipping(scope.row)">
               船次
-            </div>
+            </ws-button>
           </template>
         </el-table-column>
       </el-table>
@@ -170,7 +163,7 @@
         :page-size="deptCircularPage.pageSize"
         layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal"
-    >
+      >
       </el-pagination>
     </div>
   </div>
@@ -178,7 +171,6 @@
 <script>
 import {
   getList,
- 
   shippingList,
 } from '@/model/transport/index'
 import { downloadFile } from '@/utils/batchDown'
@@ -271,7 +263,10 @@ export default {
         
       })
     },
-    
+    handlestatus(status){
+      this.searchType = status
+      this.getList()
+    },
     delivery(item) {
       this.$router.push({
         path: 'warehouseManagementDelivery',
@@ -327,22 +322,8 @@ export default {
     //     // },
     //   })
     // },
-    //记录
-    record(item) {
-      this.$router.push({
-        name: 'warehouseManagementRecord',
-        query: {
-          baseId: item.warehouseId,
-          positionId: item.binNumberId,
-          warehouseName: item.warehouseName,
-        },
-        params: {
-          remark: item.remark,
-          binNumber: item.binNumber,
-          capacity: item.capacity,
-        },
-      })
-    },
+    
+    
     //查看
     handleLook(row) {
       this.$router.push({ 
@@ -504,6 +485,7 @@ export default {
         type: 'xls',
       })
     },
+    total(){},
   },
 }
 </script>
@@ -516,6 +498,20 @@ export default {
   width: 62px;
   text-align: right;
 }
+//分页
+.el-pagination {
+  padding: 10px 15px;
+  margin-bottom: 0;
+  text-align: center;
+}
+/deep/.el-pager li.active {
+  color: #5878e8;
+  cursor: default;
+}
+/deep/.el-pager li:hover {
+  color: #5878e8;
+  cursor: default;
+}
 .el-button--primary {
   background-color: #5878e8;
   border-color: #5878e8;

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -22,7 +22,7 @@
       </el-col>
     </el-row>
     <div class="center">
-    <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
+    <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules" class="position">
       <div class="basicInformation">
          <div class="small-title">任务详情</div>
         <ws-info-table>
@@ -89,10 +89,9 @@
       
         <div class="small-title">联络员及航次</div>
         <div
-          style="width: 100%"
           class=" position siji"
           v-for='(item,index) in deptBudgetList.tranCarInfoList'
-          :key='index'
+          :key="index+'siji'"
         >
           <ws-info-table>
           <!--姓名-->
@@ -181,53 +180,55 @@
           ></ws-input>
           </ws-form-item>
           </ws-info-table>
-          <div class="aa">
-            <div
-          style="width: 100%"
+        </div>
+         <div
+          style="width: 530px"
           class="xia"
           v-for="(items, index) in freightspace"
           :key="index"
-          v-show="item.shipType=='散船'"
-        >
-        <ws-info-table>
+        > 
+        <ws-info-table> 
           <ws-form-item :label="'仓位号-'+ (index +1 )" span="1" prop="impurity" class="bot" >
-            <ws-input
+            <!-- <ws-input
           v-model="items.impurity"
           placeholder="请输入仓位号"
           size="small"
-          ></ws-input>
+          ></ws-input> -->
+           {{items.impurity}}
           </ws-form-item>
-         
+          
         <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot" >
-          <ws-input
+          <!-- <ws-input
           v-model="items.positionWeight"
           placeholder="请输入装仓重量"
           size="small"
-          ></ws-input>
-        </ws-form-item>
-          <!-- <img
-            width="22"
-            height="22"
-            class="del"
-            @click="del(index)"
-            src="../../../public/img/del.png"
-            alt=""
-          />   -->
-            <span class="del" @click="del(index)">x</span>
+          ></ws-input> -->
+           {{items.positionWeight}}
+         </ws-form-item> 
+           <span
+              width="22"
+              height="22"
+              class="del"
+              @click="del(index)"
+              src="../../../public/img/del.png"
+              alt=""
+             >X</span
+              >
         </ws-info-table> 
+        
       </div> 
-      </div>
-      <div class="aa">
-         <el-button
-          v-show="item.shipType=='散船'"
-          class="add "
-          type="primary"
-          size="small"
+       <div>
+         <el-button class="add bg-bottom" type="primary" size="small" @click="add">
+        <img
+          width="22"
+          height="22"
           @click="add"
-          >添加仓位</el-button
-        >    
-      </div>
-        </div>
+          src="../../../public/img/add.png"
+          alt=""
+        />
+        <div class="spans">添加仓位</div>
+      </el-button>
+      </div>  
       </div>
     </ws-form>
     <div style="text-align: right; padding: 10px">
@@ -417,7 +418,7 @@ export default {
     //返回按钮
     revert() {
       this.freightspace=[]
-      this.$router.push({ path: 'tranManagementShipping' })
+      this.$router.push({ name: 'tranManagementShipping' })
     },
     del(index){
         if(this.freightspace.length > 1 ){
@@ -441,6 +442,71 @@ export default {
     },
     //提交按钮
     submit() { 
+      for(var i =0; i < this.deptBudgetList.tranCarInfoList.length;i++){
+        if (!this.deptBudgetList.tranCarInfoList[i].driver) {
+          this.$message({
+            message:'名字不为空',
+            type:'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranCarInfoList[i].driverPhone) {
+          this.$message({
+            message:'电话号不为空',
+            type:'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranCarInfoList[i].sendDateStart) {
+          this.$message({
+            message:'发船时间不能为空',
+            type:'warning'
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranCarInfoList[i].receiveDateEnd) {
+          this.$message({
+            message:'预计到港时间不能为空',
+            type:'warning'
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranCarInfoList[i].shipName) {
+          this.$message({
+            message:'船名不能为空',
+            type:'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranCarInfoList[i].shipNo) {
+          this.$message({
+            message:'航次不能为空',
+            type:'warning',
+          })
+          return
+        }
+        if (!this.deptBudgetList.tranCarInfoList[i].shipType) {
+          this.$message({
+            message:'类型不能为空',
+            type:'warning'
+          })
+          return
+        }
+        if (
+          new Date(
+            this.deptBudgetList.tranCarInfoList[i].sendDateStart
+          ).getTime() >
+          new Date(
+            this.deptBudgetList.tranCarInfoList[i].receiveDateEnd
+          ).getTime()
+        ) {
+          this.$message({
+            message: '发船时间不能大于最晚到到港时间！',
+            type: 'warning',
+          })
+          return
+        }
+      }
       this.$confirm(`提交成功后，任务将下发给相关人员，是否确定提交?`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -540,7 +606,7 @@ export default {
 }
 .title {
   position: relative;
-  padding-left: 10px;
+  // padding-left: 10px;
 }
 .title::before {
   content: '';
@@ -610,8 +676,8 @@ export default {
 //减号
 .del {
   right: -70px;
-  width: 20px;
-  height: 20px;
+  width: 13px;
+  height: 13px;
 }
 .bot{
   width: 30%;
@@ -643,7 +709,7 @@ export default {
   border: 1px solid #d8dce6;
   font-family: PingFangSC-Regular, PingFang SC;
   margin-bottom: 5px;
-  background-color: #fff;
+  // background-color: #fff;
   font-size: 14px;
   font-weight: 400;
   color: #8890b1;
@@ -717,21 +783,51 @@ export default {
   
 // }
 //添加仓位样式
-.add{
-  width: 90px;
-  height: 20px;
+.add {
+  width: 100px;
+  height: 34px;
+  background: #f6f7fb;
+  border-radius: 17px;
+  color: #5473e8;
   font-size: 14px;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  line-height: 20px;
   border: none;
+  margin-top:8px;
 }
-//
-.xia{
-  width: 600px;
-  height:54px ;
-  // background: #F6F7FC;
-  border-radius: 4px;
-  border: 1px solid #D8DCE6;
+.add img {
+  display: inline-block;
+  margin-top: 3px;
+  margin-left: -12px;
+}
+.add .spans {
+  display: table-caption;
+  width: 56px;
+  height: 20px;
+  line-height: 18px;
+}
+/deep/.xia {
+    width: 500px;
+    height: 54px;
+    border-radius: 4px;
+    border: 1px solid #D8DCE6;
+    margin-top: 10px;
+    width: 462px;
+    height: 54px;
+    background: #F6F7FC;
+    border-radius: 4px;  
 }
+ .basicInformation .ws-info-table {
+    border: none;
+    width: 1000px;
+}
+ .position.siji {
+    background: #F6F7FC;
+    border-radius: 4px;
+    border: 1px solid #D8DCE6;
+    width: 1010px;
+}
+.el-input--small .el-input__inner {
+    border-block-color:  #F6F7FC;
+    background: #F6F7FC;
+}
+
 </style>

src/views/tranManagement/tranManagementShippingLook.vue

@@ -162,14 +162,13 @@
         </ws-info-table>
        <div class="small-title">联络员及航次</div>
        <div class="aa">
-       <div  class="small-title">航次信息</div>
+       <div class="small-title">航次信息</div>
       <div
           style="width: 100%"
           class="flex position"
            v-for="(item, index) in deptBudgetList.tranCarInfoList"
-           :key="index.id"
+           
         >
-        
         <ws-info-table>
           <!-- 姓名 -->
           <ws-form-item label="姓名" span="1" prop="driver" class="siji">
@@ -249,9 +248,9 @@
         <div class="xia">
       <div
           style="width: 100%"
-          class=""
-         v-for="(item, index) in freightspace"
-         :key="index"
+          class="flex position"
+         v-for="(items, index) in freightspace"
+         :key='index'
         >
      <ws-info-table>
         <ws-form-item :label="'仓位号-'+ (index + 1 )" span="1" prop="impurity" class="bot">
@@ -260,7 +259,7 @@
           placeholder="请输入仓位号"
           size="small"
           ></ws-input> -->
-          {{item.impurity}}
+          {{items.impurity}}
           </ws-form-item>
           <!-- 重量（吨） -->
           <ws-form-item label="重量(吨)" span="1" prop="positionWeight" class="bot">
@@ -269,7 +268,7 @@
           placeholder="请输入装仓重量"
           size="small"
           ></ws-input> -->
-          {{item.positionWeight}}
+          {{items.positionWeight}}
         </ws-form-item>
         
      </ws-info-table>
@@ -311,7 +310,6 @@ import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import {shippingList,shippingLook } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-// import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
@@ -633,10 +631,10 @@ export default {
 .del {
   right: -70px;
 }
-.bot{
-  width: 30%;
-  border: none;
-}
+// .bot{
+//   width: 30%;
+//   border: none;
+// }
 .siji{
   width: 300px;
 }
@@ -719,26 +717,25 @@ export default {
   border-radius: 4px;
   border: 1px solid #D8DCE6;
 }
-.xia{
-  width:70%;
-  height: 46px;
-  background: #F5F7FA;
-  border-radius: 4px;
-  border: 1px solid #D8DCE6;
-  margin-top: 10px;
-  border: none;
-}
-.xiaxia{
-  width: 70%;
-  height: 46px;
-  background: #F5F7FA;
-  border-radius: 4px;
-  // border: 1px solid #D8DCE6;
-  margin-top: 10px;
-  // border: none;
+// .xia{
+//   width:500px;
+//   // height: 46px;
+//   background: #F5F7FA;
+//   border-radius: 4px;
+//   // border: 1px solid #D8DCE6;
+//   margin-top: 10px;
+//   border: none;
+// }
+.xia {
+    width: 700px;
+    // height: 50px;
+    border-radius: 4px;
+    border: 1px solid #D8DCE6;
+    margin-top: 10px;
+    border: none;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
-    background-color: #f5f7fa;
+    // background-color: #f5f7fa;
     font-size: 14px;
     font-family: PingFangSC-Regular, PingFang SC;
     font-weight: 400;
@@ -748,4 +745,13 @@ export default {
 .position .siji {
     width: 14.2%;
 }
+.el-form {
+    height: 1000px;
+}
+.flex {
+    flex-direction: column;
+}
+/deep/.position .ws-info-table .el-form-item .el-form-item__label {
+    background-color: #f5f7fa;
+}
 </style>

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -176,7 +176,17 @@
             <!--磅单-->
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
-                <img
+                <el-upload
+                action="https://www.zthymaoyi.com/upload/admin"
+                :show-file-list="false"
+                :on-success="
+                  (res, file) => {
+                    uploadSuccessHandle1(index, res, file)
+                  }
+                "
+                class="avatar-uploader"
+                accept=".jpg, .jpeg, .png, .gif"
+                ><img
                   width="18"
                   height="20"
                   style="
@@ -185,9 +195,9 @@
                     top: -1px;
                   "
                   src="../../../public/img/fujian.png"
-                  @click="fujian(scope.row)"
                   alt=""
                 />
+              </el-upload>
                 <div v-show="item.temporaryDriverFlag == 0">
                   {{ item.signStatus }}
                 </div>
@@ -254,7 +264,7 @@
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback } from '@/model/transport/index'
+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'
@@ -309,6 +319,17 @@ export default {
       size: 10,
       value1: '',
       unitList: [],
+      freightspace1: [
+        {
+          accountTypeFlag: '1',
+          payeeName: '',
+          payeeNumberCard: '',
+          compName: '',
+          bankDeposit: '',
+          addressUrlArray: [],
+          bankCard: '',
+        },
+      ],
       freightspace: [
         {
           driver: '',
@@ -584,21 +605,39 @@ export default {
         }
       }
     },
-    //上传
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
+    uploadSuccessHandle1(index, e, fileList) {
+      console.log(index, e, fileList)
+      const that = this
+      // this.deptBudgetList.cardAddressUrl = e.url
+      getbank({ bankImg: e.url })
+        .toPromise()
+        .then((response) => {
+          for (var i = 0; i < this.freightspace1.length; i++) {
+            if (i == index) {
+              this.freightspace1[i].payeeAddressUrl = e.url
+              this.freightspace1[i].bankCard = response.bankNo
+              this.freightspace1[i].bankDeposit = response.bankName
+              this.freightspace1[i].bankDepositBranchList =
+                response.bankNameZhihang
+            }
+          }
+        })
     },
+    //上传
+    // fujian(row) {
+    //   if (
+    //     row.receiveAttachmentPath === null ||
+    //     row.receiveAttachmentPath === ''
+    //   ) {
+    //     EventBus.$emit(
+    //       'warning',
+    //       this.$t('system.noticeCircular.NoInformation')
+    //     )
+    //   } else {
+    //     this.accessoryTFs = true
+    //   }
+    //   this.appendixIdss = row.receiveAttachmentPath
+    // },
   },
 }
 </script>

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -86,8 +86,8 @@
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
         <!-- 运输方式 -->
-        <ws-form-item label="运输方式" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
+        <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>
@@ -105,10 +105,7 @@
             <ws-form-item label="姓名:" span="1" prop="driver" v-show="freightspace[index].temporaryDriverFlag == 0">
               <span>{{ item.driver }} </span>
             </ws-form-item>
-            <!--司机-->
-            <ws-form-item label="姓名:" span="1" prop="driver" v-show="freightspace[index].temporaryDriverFlag == 1">
-              <span>{{ item.driver }} </span>
-            </ws-form-item>
+
             <!--电话-->
             <ws-form-item label="司机电话" span="1" prop="driverPhone">
               <span>{{ item.driverPhone }} </span>
@@ -117,10 +114,14 @@
             <ws-form-item label="车牌号" span="1" prop="carNo">
               <span>{{ item.carNo }} </span>
             </ws-form-item>
-            <!--装车净重-->
-            <ws-form-item label="装车净重" span="1" prop="loadNetWeight">
+            <!--装车(吨)-->
+            <ws-form-item label="装车(吨)" span="1" prop="loadNetWeight">
               {{ item.loadNetWeight }}
             </ws-form-item>
+            <!-- 卸车 -->
+            <ws-form-item label="卸车(吨)" span="1" prop="unloadNetWeight">
+              {{item.unloadNetWeight}}
+            </ws-form-item>
             <!--磅单-->
             <ws-form-item label="磅单" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
@@ -769,5 +770,4 @@ margin-top: 20px;
 .catNosCor{
   color: #5473E8;
 }
-
 </style>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -3,11 +3,11 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" type="primary" @click="handleAdd()">
+        <ws-button class="but" type="primary" @click="statusquery(1)">
           执行中</ws-button
         >
-        <ws-button class="but" @click="handleLook()">已完成</ws-button>
-        <ws-button class="but" @click="handleEdit()">全部任务</ws-button>
+        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="left">
@@ -193,11 +193,12 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
-      searchType: 1,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
       tranTypeKey: 2,
+      searchType: 1,
+      searchTypeOne : 1,
       // 提交类型
       submitType: true,
       size: 10,
@@ -290,14 +291,10 @@ export default {
         },
       })
     },
-
-    //已完成
-    handleLook() {},
-    //待完成
-    handleAdd() {},
-    //全部任务
-    handleEdit() {},
-
+     statusquery(status){
+      this.searchTypeOne = status
+      this.getList()
+    },
     dateFormat(fmt, date) {
       let ret
       const opt = {
@@ -337,6 +334,7 @@ export default {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         contractType: this.contractType,
+          searchTypeOne :this.searchTypeOne,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
       })
@@ -346,14 +344,14 @@ export default {
         })
     },
     editClick(row) {
-      var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
-        status = '执行中'
-      } else if (row.status == '执行中') {
-        status = '已完成'
+      var feedbackStatus = ''
+      if (row.feedbackStatus == '待执行' || row.feedbackStatus == '已完成') {
+        feedbackStatus = '执行中'
+      } else if (row.feedbackStatus == '执行中') {
+        feedbackStatus = '已完成'
       }
       //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${status}`, {
+      this.$confirm(`是否将状态改为${feedbackStatus}`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
@@ -389,12 +387,35 @@ export default {
       this.currentPage = 1
       this.getList()
     },
+     async exportlist() {
+      const { data } = await export1(
+        {
+          compId: sessionStorage.getItem('ws-pf_compId'),
+          contractType: this.contractType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          searchKeyWord: this.searchKeyWord,
+          startDate: this.startDate,
+          endDate: this.endDate,
+        },
+        {},
+        { responseType: 'blob' }
+      ).toPromise()
+      downloadFile({
+        res: data,
+        fileName: `${
+          this.date.year + (this.date.month ? `-${this.date.month}` : '')
+        }_采购合同`,
+        type: 'xls',
+      })
+    },
   },
 }
 </script>
 <style lang="scss" scoped>
 .container {
-  width: 90%;
+  width: 100%;
   margin: 0 auto;
 }
 .vertical-text-left {

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -1,16 +1,17 @@
 //火运调度
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="12">
+    <BaseHeaderLayout :leftSpan="20">
       <template slot="left">
-        <ws-button class="but" type="primary" @click="handleAdd()">
+        <ws-button class="but" type="primary" @click="statusquery(1)">
           执行中</ws-button
         >
-        <ws-button class="but" @click="handleLook()">已完成</ws-button>
-        <ws-button class="but" @click="handleEdit()">全部任务</ws-button>
+        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="left">
+         <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
         <ws-date-picker
           v-model="deptBudgetList.inOutDate"
           type="date"
@@ -186,7 +187,6 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
-      searchType: 1,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
@@ -196,6 +196,7 @@ export default {
       size: 10,
       spanArr: [],
       warehouseName: '',
+      searchType: 1,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       tranManagementList: [],
@@ -261,13 +262,10 @@ export default {
         },
       })
     },
-
-    //待完成
-    handleLook() {},
-    //已完成
-    handleAdd() {},
-    //全部任务
-    handleEdit() {},
+    statusquery(state){
+      this.searchType = state
+      this.getList()
+    },
 
     dateFormat(fmt, date) {
       let ret
@@ -308,6 +306,7 @@ export default {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         contractType: this.contractType,
+        searchType : this.searchType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         tranTypeKey: this.tranTypeKey,
@@ -395,7 +394,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .container {
-  width: 90%;
+  width: 100%;
   margin: 0 auto;
 }
 .vertical-text-left {

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -193,7 +193,6 @@
           </div>
         </ws-info-table> 
       </div>
-      
       <el-button class="add bg-bottom" type="primary" size="small" @click="add">
         <img
           width="22"
@@ -240,7 +239,6 @@ export default {
   },
   data() {
     return {
-      staffList: [],
       deptBudgetList: {
         totalStorage: 0,
       },
@@ -449,7 +447,6 @@ export default {
                 this.arr.push(num)
               }
               this.deptBudgetList.totalStorage = this.totalStorage
-
               this.tranCarInfoList.driver = this.deptBudgetList.driver
               this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
               this.tranCarInfoList.sendDateStart =

src/views/tranManagement/tranManagementVehicle.vue

@@ -11,6 +11,7 @@
       </template>
       <!-- 接单开始 -->
       <template slot="left">
+        <span style="display: inline-block; width: 290px;color: #8890B1;">接单日期</span>
         <ws-date-picker
           v-model="deptBudgetList.inOutDate"
           type="date"
@@ -26,7 +27,7 @@
         />
         <ws-input
           v-model="searchKeyWord"
-          placeholder="可按照合同编号、买方名称、卖方名称进行查找"
+          placeholder="可按发货人、收货人、任务编号查找"
           clearable
           maxlength="500"
           type="input"
@@ -182,10 +183,10 @@ export default {
       year: '',
       currentPage: 1,
       pageSize: 10,
-      searchType: 1,
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
+      searchType:1,
       // 提交类型
       submitType: true,
       size: 10,
@@ -275,6 +276,10 @@ export default {
         },
       })
     },
+    statusquery(status){
+      this.searchType = status
+      this.getList()
+    },
     // // 派车
     // warehousing() {
     //   this.$router.push({ path: 'tranManagementVehicleDispatching' })
@@ -319,6 +324,7 @@ export default {
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
+        searchType: this.searchType,
         tranTypeKey: this.tranTypeKey,
       })
         .toPromise()
@@ -539,5 +545,6 @@ export default {
 .el-range-editor--small.el-input__inner {
   height: 32px;
   margin-left: -20%;
+  
 }
 </style>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -432,7 +432,6 @@ export default {
             }
           }
           this.deptBudgetList = response
-          console.log(this.deptBudgetList.tranCarInfoList, '集合')
           if (this.deptBudgetList.tranCarInfoList.length == 0) {
             this.deptBudgetList.tranCarInfoList = [
               {

src/views/warehouse/warehouseManagementAdd.vue

@@ -54,7 +54,7 @@
             @change="selectstaff"
           >
             <el-option
-              v-for="item in personCharge"
+              v-for="item in options"
               :key="item.value"
               :label="item.staffName"
               :value="item.staffName"
@@ -230,7 +230,6 @@ export default {
   data() {
     let self = this
     return {
-      staffList: [],
       deptBudgetList: {
         totalStorage: 0,
       },
@@ -242,6 +241,8 @@ export default {
       window: '',
       radio: 1,
       personCharge: [],
+      options: [],
+      staffList: [],
       polygons: [
         {
           pName: 'Geolocation', //定位
@@ -280,6 +281,7 @@ export default {
           },
         ],
       },
+
       appendixIdsAdd: '',
       size: 10,
       value1: '',
@@ -601,8 +603,8 @@ export default {
                 this.deptBudgetList.warehousePositionInfoList =
                   this.freightspace
                 this.deptBudgetList.totalStorage = this.totalStorage
-                if(this.radio == 2){
-                  this.deptBudgetList.warehousetype ==2
+                if (this.radio == 2) {
+                  this.deptBudgetList.warehousetype == 2
                 }
 
                 increase(this.deptBudgetList)
@@ -677,8 +679,8 @@ export default {
         .toPromise()
         .then((response) => {
           // this.agent = response
-          //           this.options = response
-          //            this.staffList = response
+          this.options = response
+          this.staffList = response
           this.personCharge = response
         })
     },

src/views/warehouse/warehouseManagementList.vue

@@ -91,7 +91,7 @@
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
             >
-              {{ item.inNetWeight }}
+               {{item.inNetWeight}}
             </div>
           </template>
         </el-table-column>
@@ -168,7 +168,7 @@
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
             >
-              {{ item.inNetWeight }}
+               {{ item.goodsName}}({{item.inNetWeight}})
             </div>
           </template>
         </el-table-column>
@@ -178,7 +178,7 @@
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
             >
-              {{ item.outNetWeight }}
+             {{ item.goodsName}}({{item.outNetWeight}})
             </div>
           </template>
         </el-table-column>
@@ -190,7 +190,7 @@
             >
               {{ item.inNetWeight - item.outNetWeight }}
 
-              {{ item.storage }}
+              {{item.storage }}
             </div>
           </template>
         </el-table-column>
@@ -302,6 +302,7 @@ export default {
   },
 
   methods: {
+   
     //清仓
     clearance(row) {
       console.log(row.outNumber)
@@ -417,6 +418,7 @@ export default {
             warehouseName: row.warehouseName,
             binNumber: row.binNumber,
             warehouseType: this.warehouseType,
+            createType: row.createType,
           },
         })
       }

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -31,7 +31,9 @@
             alt=""
           />
           {{ this.$route.query.warehouseName }}库
-          <span class="position" v-show="this.$route.query.warehouseType == 1"> {{ this.$route.query.binNumber }}仓位 </span>
+          <span class="position" v-show="this.$route.query.warehouseType == 1">
+            {{ this.$route.query.binNumber }}仓位
+          </span>
           <span v-show="this.$route.query.warehouseType == 2">(临)</span>
         </h2>
         <el-table :data="improved.records">
@@ -200,8 +202,13 @@ export default {
     this.deptBudgetList1.warehouseName = this.$route.query.warehouseName
     this.binNumber = this.$route.params.binNumber
     this.deptBudgetList.warehouseType = this.$route.query.warehouseType
+    this.createType=this.$route.query.createType,
     //接参
-    this.getList(this.$route.query.baseId, this.$route.query.positionId , this.$route.query.warehouseType)
+    this.getList(
+      this.$route.query.baseId,
+      this.$route.query.positionId,
+      this.$route.query.warehouseType
+    )
     this.showType = this.isShow
   },
   methods: {
@@ -216,60 +223,62 @@ export default {
         this.$router.push({
           path: 'warehouseManagementPerfectput',
           query: {
-             id:row.id,
-             agent:row.agent,
-             baseId: row.baseId,
-             binNumber: row.binNumber,
-             carNo:row.carNo,
-             compId:row.compId,
-             contractNo:row.contractNo,
-             goodsName:row.goodsName,
-             goodsNameKey:row.goodsNameKey,
-             grade:row.grade,
-             grossWeight:row.grossWeight,
-             inOutDate:row.inOutDate,
-             inOutFlag:row.inOutFlag,
-             inOutType:row.inOutType,
-             inOutTypeKey:row.inOutTypeKey,
-             netWeight:row.netWeight,
-             positionId: row.positionId,
-             statusFlag:row.statusFlag,
-             tare:row.tare,
-             warehouseName: row.warehouseName,  
-             warehouseInOutDetail:row.warehouseInOutDetail,
-             warehouseType: this.deptBudgetList.warehouseType
+            id: row.id,
+            agent: row.agent,
+            baseId: row.baseId,
+            binNumber: row.binNumber,
+            carNo: row.carNo,
+            compId: row.compId,
+            contractNo: row.contractNo,
+            goodsName: row.goodsName,
+            goodsNameKey: row.goodsNameKey,
+            grade: row.grade,
+            grossWeight: row.grossWeight,
+            inOutDate: row.inOutDate,
+            inOutFlag: row.inOutFlag,
+            inOutType: row.inOutType,
+            inOutTypeKey: row.inOutTypeKey,
+            netWeight: row.netWeight,
+            positionId: row.positionId,
+            statusFlag: row.statusFlag,
+            tare: row.tare,
+            warehouseName: row.warehouseName,
+            warehouseInOutDetail: row.warehouseInOutDetail,
+            warehouseType: this.deptBudgetList.warehouseType,
+            createType: this.createType
+          
           },
         })
-      } else if(row.inOutFlag==1){
+      } else if (row.inOutFlag == 1) {
         this.$store.dispatch('app/setdeptBudgetList', row)
-      // this.$store.commit('deptBudgetList',row)
+        // this.$store.commit('deptBudgetList',row)
         this.$router.push({
           path: 'warehouseManagementPerfectDelivery',
           query: {
-             id:row.id,
-             agent:row.agent,
-             baseId: row.baseId,
-             binNumber: row.binNumber,
-             carNo:row.carNo,
-             compId:row.compId,
-             contractNo:row.contractNo,
-             goodsName:row.goodsName,
-             goodsNameKey:row.goodsNameKey,
-             grade:row.grade,
-             grossWeight:row.grossWeight,
-             inOutDate:row.inOutDate,
-             inOutFlag:row.inOutFlag,
-             inOutType:row.inOutType,
-             inOutTypeKey:row.inOutTypeKey,
-             netWeight:row.netWeight,
-             positionId: row.positionId,
-             statusFlag:row.statusFlag,
-             tare:row.tare,
-             warehouseName: row.warehouseName,  
-             warehouseInOutDetail:row.warehouseInOutDetail,
-             warehouseType: this.deptBudgetList.warehouseType,
-          }
-          })
+            id: row.id,
+            agent: row.agent,
+            baseId: row.baseId,
+            binNumber: row.binNumber,
+            carNo: row.carNo,
+            compId: row.compId,
+            contractNo: row.contractNo,
+            goodsName: row.goodsName,
+            goodsNameKey: row.goodsNameKey,
+            grade: row.grade,
+            grossWeight: row.grossWeight,
+            inOutDate: row.inOutDate,
+            inOutFlag: row.inOutFlag,
+            inOutType: row.inOutType,
+            inOutTypeKey: row.inOutTypeKey,
+            netWeight: row.netWeight,
+            positionId: row.positionId,
+            statusFlag: row.statusFlag,
+            tare: row.tare,
+            warehouseName: row.warehouseName,
+            warehouseInOutDetail: row.warehouseInOutDetail,
+            warehouseType: this.deptBudgetList.warehouseType,
+          },
+        })
       }
     },
     dateFormat(fmt, date) {
@@ -308,31 +317,31 @@ export default {
       this.getList()
     },
     //收
-    getList(id, id1,id2) { 
-      if(id2==1){
-      complete({
-        // compId: sessionStorage.getItem('ws-pf_compId'),
-        baseId: id,
-        positionId: id1,
-        pageSize: this.pageSize,
-        currentPage: this.currentPage,
-        // inOutDate:this.inOutDate
-      })
-        .toPromise()
-        .then((response) => {
-          this.improved = response
+    getList(id, id1, id2) {
+      if (id2 == 1) {
+        complete({
+          // compId: sessionStorage.getItem('ws-pf_compId'),
+          baseId: id,
+          positionId: id1,
+          pageSize: this.pageSize,
+          currentPage: this.currentPage,
+          // inOutDate:this.inOutDate
         })
-      }else if(id2==2){   
-      completeList({
-        baseId: id,
-        positionId: id1,
-        pageSize: this.pageSize,
-        currentPage: this.currentPage,
-      })
-        .toPromise()
-        .then((response) => {
-          this.improved = response
+          .toPromise()
+          .then((response) => {
+            this.improved = response
+          })
+      } else if (id2 == 2) {
+        completeList({
+          baseId: id,
+          positionId: id1,
+          pageSize: this.pageSize,
+          currentPage: this.currentPage,
         })
+          .toPromise()
+          .then((response) => {
+            this.improved = response
+          })
       }
     },
     handleExamine(row) {
@@ -342,29 +351,32 @@ export default {
       })
     },
     //删除
-      handleDelete(row) {
+    handleDelete(row) {
       this.$confirm(`删除后不可恢复，确认删除？`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
         type: 'warning',
       })
         .then(() => {
-       delInOut({id:row.id})
+          delInOut({ id: row.id })
             .toPromise()
             .then((response) => {
               this.$notify.success({
                 title: '成功',
                 message: '删除成功',
               })
-              this.getList(row.baseId,row.positionId,this.$route.query.warehouseType)
-            })
-            .catch((response) => {
+              this.getList(
+                row.baseId,
+                row.positionId,
+                this.$route.query.warehouseType
+              )
             })
+            .catch((response) => {})
         })
         .catch(() => {
           return false
         })
-      }
+    },
   },
   find() {
     this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -186,7 +186,7 @@
             </ws-select>
           </ws-form-item>
         </ws-info-table>
-        <div warehouseType>
+        <div  v-show="this.$route.query.warehouseType == 2 && this.$route.query.createType == 2">
           <el-checkbox v-model="checked" checked>退库并出库</el-checkbox>
           <ws-info-table v-show="checked == true">
             <!-- 出库类型 -->
@@ -462,6 +462,7 @@ export default {
     this.dataList.statusFlag = this.$route.statusFlag
     this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
     this.deptBudgetList.warehouseType = this.$route.query.warehouseType
+    this.deptBudgetList.createType = this.$route.query.createType
   },
   methods: {
     //返回按钮

src/views/warehouse/warehouseManagementPut.vue

@@ -183,7 +183,7 @@
             </ws-select>
           </ws-form-item>
         </ws-info-table>
-        <div v-show="this.$route.query.warehouseType == 2">
+        <div v-show="this.$route.query.warehouseType == 2 && this.deptBudgetList.createType == 2">
           <el-checkbox v-model="checked" checked>退库并出库</el-checkbox>
           <ws-info-table
             v-show="checked == true && this.deptBudgetList.createType == 2"

src/views/warehouse/warehouseManagementRecord.vue

@@ -10,6 +10,7 @@
           type="primary"
           size="small"
           @click="iossrecord()"
+          v-show="this.warehouseType != 2"
           >盘损记录</el-button
         >
         <el-button
@@ -69,7 +70,7 @@
         <div
           class="record"
           :class="{ active: status == 2 }"
-          @click="record(1, 2)"
+          @click="record(2, 2)"
         >
           <img
             v-if="status != 2"
@@ -89,7 +90,7 @@
         <div
           class="record"
           :class="{ active: status == 3 }"
-          @click="record(2, 3)"
+          @click="record(3, 3)"
         >
           <img
             v-if="status != 3"
@@ -190,7 +191,8 @@
           </el-table-column>
           <el-table-column prop="agent" label="经办人">
           </el-table-column>
-          <el-table-column prop="buyer" label="内勤"> </el-table-column>
+          <el-table-column prop="buyer" label="内勤">
+             </el-table-column>
           <el-table-column prop="addressUrl" label="附件">
             <template slot-scope="scope">
               <img
@@ -298,7 +300,7 @@
           </el-table-column>
           <el-table-column prop="agent" label="经办人">
           </el-table-column>
-          <el-table-column prop="buyer" label="内勤"> </el-table-column>
+          <el-table-column prop="backOffice" label="内勤"> </el-table-column>
           <el-table-column prop="addressUrl" label="附件">
             <template slot-scope="scope">
               <img