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

src/api/V2/taskspost/index.js

@@ -19,4 +19,10 @@ export const API_GET_TRAN_EXAMINE = '/tranTaskInfo/getTranTask'
 // 运输任务-编辑
 export const API_GET_TRAN_EDIT = '/tranTaskInfo/api/editTranTask'
 // 出入库任务-新增（编辑）
-export const API_POST_OUT_PUT = '/warehouseInOutInfo/insertOrUpdateInOutTask'
+export const API_POST_OUT_PUT = '/inOutWarehouseTask/api/insertOrUpdateInOutTask'
+// 出入库任务-列表
+export const API_GET_OUT_LIST = '/inOutWarehouseTask/selectInOutWarehouseTask'
+// 出入库任务-查看
+export const API_GET_OUT_EXAMINE = '/inOutWarehouseTask/getInOutWarehouseTask'
+// 出入库任务-删除
+export const API_POST_OUT_DEL = '/inOutWarehouseTask/api/deleteInOutWarehouseTask'

src/lang/zh.js

@@ -513,7 +513,7 @@
     tranManagementDriverEdit: '编辑司机',
     // 任务管理
     taskManagement: '任务管理',
-    moveWarehouseTask:'移库任务',
+    moveWarehouseTask: '移库任务',
     tranManagementLook: '运输任务查看',
     tranManagementTransportAdd: '运输任务添加',
     tranManagementTransportEdit: '运输任务编辑',
@@ -523,10 +523,10 @@
     tranManagementVehicleDispatching: '汽车调度',
     tranManagementVehicleLook: '查看派车详情',
     tranManagementTransporTationFire: '火运调度',
-    inOutWarehouseTaskEdit:'编辑',
-    tranManagementShipping:'船运调度',
-    tranManagementShippingArrangemen:'船次安排',
-    tranManagementShippingLook:'船运调度详情',
+    inOutWarehouseTaskEdit: '查看',
+    tranManagementShipping: '船运调度',
+    tranManagementShippingArrangemen: '船次安排',
+    tranManagementShippingLook: '船运调度详情',
 
     tranManagementTransporTrainNo: '车次安排',
     tranManagementTransporTrainDetails: '火运调度详情',
@@ -534,11 +534,11 @@
     tranManagementTransporHairRespond: '发货反馈',
     tranManagementTransporFeedback: '反馈',
 
-    tranManagementTransporFeedbackLook : '查看',
+    tranManagementTransporFeedbackLook: '查看',
 
-    tranManagementReceivingFeedback:'收货反馈',
-    tranManagementReceivingloading:'反馈',
-    tranManagementReceivingloadingLook:'查看',
+    tranManagementReceivingFeedback: '收货反馈',
+    tranManagementReceivingloading: '反馈',
+    tranManagementReceivingloadingLook: '查看',
 
 
     // 采购模块
@@ -4744,7 +4744,7 @@
     tranManagementDriverAdd: '添加司机',
     tranManagementDriverLook: '查看司机',
     tranManagementDriverEdit: '编辑司机',
- 
+
   },
   tranManagementTransport: {
     tranManagementTransport: '运输任务',
@@ -4762,21 +4762,21 @@
     tranManagementTransporTrainNo: '车次安排',
     tranManagementTransporTrainDetails: '火运调度详情',
   },
-  tranManagementTransporHairRespond:{
+  tranManagementTransporHairRespond: {
     tranManagementTransporHairRespond: '发货反馈',
-    tranManagementTransporFeedback:'反馈',
-    tranManagementTransporFeedbackLook : '查看'
+    tranManagementTransporFeedback: '反馈',
+    tranManagementTransporFeedbackLook: '查看'
   },
-  tranManagementShipping:{
-    tranManagementShipping:'船运调度',
-    tranManagementShippingArrangemen:'船次安排',
-    tranManagementShippingLook:'船运调度详情'
+  tranManagementShipping: {
+    tranManagementShipping: '船运调度',
+    tranManagementShippingArrangemen: '船次安排',
+    tranManagementShippingLook: '船运调度详情'
   },
-  tranManagementReceivingFeedback:{
-    tranManagementReceivingFeedback:'收货反馈',
-    tranManagementReceivingloading:'反馈',
-    tranManagementReceivingloadingLook:'查看',
-    
+  tranManagementReceivingFeedback: {
+    tranManagementReceivingFeedback: '收货反馈',
+    tranManagementReceivingloading: '反馈',
+    tranManagementReceivingloadingLook: '查看',
+
   },
   // 任务管理
   tranManagement: '任务管理',

src/model/tasksport/index.js

@@ -11,7 +11,10 @@ import {
     API_POST_TRAN_DEL,
     API_GET_TRAN_EXAMINE,
     API_GET_TRAN_EDIT,
-    API_POST_OUT_PUT
+    API_POST_OUT_PUT,
+    API_GET_OUT_LIST,
+    API_GET_OUT_EXAMINE,
+    API_POST_OUT_DEL
 } from '@/api/V2/taskspost'
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
@@ -31,5 +34,11 @@ export const deltran = appRx.post(API_POST_TRAN_DEL, errorCatcher, errorHandle,
 export const examinetran = appRx.get(API_GET_TRAN_EXAMINE, errorCatcher, errorHandle, filter)
 //运输任务-编辑
 export const edittran = appRx.post(API_GET_TRAN_EDIT, errorCatcher, errorHandle, filter)
-//出入库任务-编辑
+//出入库任务-编辑(新增)
 export const addoreditoutput = appRx.post(API_POST_OUT_PUT, errorCatcher, errorHandle, filter)
+//出入库任务-列表
+export const getoreditoutput = appRx.get(API_GET_OUT_LIST, errorCatcher, errorHandle, filter)
+//出入库任务-查看
+export const outexamine = appRx.get(API_GET_OUT_EXAMINE, errorCatcher, errorHandle, filter)
+//出入库任务-删除
+export const outdelete = appRx.post(API_POST_OUT_DEL, errorCatcher, errorHandle, filter)

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="请输入已开发票（元））"

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

@@ -101,7 +101,7 @@ const tranManagementRouter = {
         keepAlive: true
       },
     },
-    //出入库任务编辑
+    //出入库任务查看
     {
       path: 'inOutWarehouseTaskEdit',
       component: () =>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -46,7 +46,7 @@
         class="wenzi"
         :data="gainList.records"
         style="width: 100%; margin-top: 20px"
-        height="780"
+        height="650"
       >
         <el-table-column type="index" label="序号">
           <template scope="scope">
@@ -56,20 +56,20 @@
         </el-table-column>
         <el-table-column prop="contractNo" label="合同编号" width="80">
         </el-table-column>
-        <el-table-column prop="taskNo" label="任务编号"> </el-table-column>
-        <el-table-column prop=" warehouseName" class="table_td" label="库房名">
+        <el-table-column prop="inOutTaskNo" label="任务编号"> </el-table-column>
+        <el-table-column prop="warehouseName" class="table_td" label="库房名">
         </el-table-column>
         <el-table-column prop="inOutType" class="table_td" label="出入库类型">
         </el-table-column>
         <el-table-column prop="goodsName" class="table_td" label="货名">
         </el-table-column>
-        <el-table-column prop=" weight" class="table_td" label="重量（吨）">
+        <el-table-column prop="weight" class="table_td" label="重量（吨）">
         </el-table-column>
-        <el-table-column prop="yujiDate" class="table_td" label="预计日期">
+        <el-table-column prop="predictDate" class="table_td" label="预计日期">
         </el-table-column>
         <el-table-column prop="publisher" class="table_td" label="发布者">
         </el-table-column>
-        <el-table-column prop="status" label="状态">
+        <el-table-column prop="taskStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -81,15 +81,18 @@
               <template>
                 <span slot="reference">
                   <span
-                    v-if="scope.row.status == '待审核'"
+                    v-if="scope.row.taskStatus == '待审核'"
                     class="executory"
                   ></span>
                   <span
-                    v-if="scope.row.status == '执行中'"
+                    v-if="scope.row.taskStatus == '执行中'"
                     class="inExecution"
                   ></span>
-                  <span v-if="scope.row.status == '已完成'" class="done"></span
-                  >{{ scope.row.status }}
+                  <span
+                    v-if="scope.row.taskStatus == '已完成'"
+                    class="done"
+                  ></span
+                  >{{ scope.row.taskStatus }}
                 </span>
               </template>
               <div>
@@ -121,25 +124,56 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="createDate" class="table_td" label="创建时间">
+        <el-table-column prop="establishDate" class="table_td" label="创建时间">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
             <ws-button class="completed" @click="nocomplete(scope.row)">
               查看
             </ws-button>
-            <ws-button class="putstorage" @click="delivery(scope.row)">
+            <ws-button
+              v-if="scope.row.taskStatus == '待审核'"
+              class="putstorage"
+              @click="delivery(scope.row)"
+            >
+              审核
+            </ws-button>
+            <ws-button
+              v-if="
+                scope.row.taskStatus == '执行中' ||
+                scope.row.taskStatus == '已驳回'
+              "
+              class="putstorage"
+              @click="delivery(scope.row)"
+            >
               编辑
             </ws-button>
-            <ws-button @click="deleteclick(scope.row)"> 删除 </ws-button>
+            <ws-button
+              v-if="
+                scope.row.taskStatus == '执行中' ||
+                scope.row.taskStatus == '已驳回'
+              "
+              @click="deleteclick(scope.row)"
+            >
+              删除
+            </ws-button>
           </template>
         </el-table-column>
       </el-table>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal"
+      >
+      </el-pagination>
     </div>
   </div>
 </template>
 <script>
-import { gain, deltran } from '@/model/tasksport/index'
+import { getoreditoutput, outdelete } from '@/model/tasksport/index'
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
@@ -184,6 +218,7 @@ export default {
       size: 10,
       spanArr: [],
       warehouseName: '',
+      deptBudgetTotal: 0,
       compId: sessionStorage.getItem('ws-pf_compId'),
       deptCircularPage: {},
       historyList: [],
@@ -201,7 +236,7 @@ export default {
   },
   methods: {
     //添加
-    add() {
+    handleAdd() {
       this.$router.push({ path: 'tranManagementWarehouseInOutTaskAdd' })
     },
     //查找
@@ -210,16 +245,27 @@ export default {
       this.getList()
     },
     deleteclick(row) {
+      var text = ''
+      if (
+        (row.taskTypeKey == 3 && row.inOutType == '移库出库') ||
+        (row.taskTypeKey == 4 && row.inOutType == '销售出库')
+      ) {
+        text = '相同任务编号的任务将一并删除且不可恢复，是否确定删除？'
+      } else {
+        text = `运输任务删除后不可恢复，是否确定删除？`
+      }
       //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`运输任务删除后不可恢复，是否确定删除？`, {
+      this.$confirm(text, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
           console.log(row)
-          deltran({
+          outdelete({
             id: row.id,
+            relevanceId: row.relevanceId,
+            inOutFlag:row.inOutFlag
           })
             .toPromise()
             .then((response) => {
@@ -231,16 +277,20 @@ export default {
         })
     },
     getList() {
-      gain({
+      getoreditoutput({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        searchType: this.searchType,
+        // searchType: this.searchType,
         searchKeyWord: this.searchKeyWord,
       })
         .toPromise()
         .then((response) => {
+          console.log(response)
           this.gainList = response
+          this.currentPage = response.current
+          this.pageSize = response.size
+          this.deptBudgetTotal = response.total
         })
     },
     handlestatus(status) {
@@ -250,29 +300,13 @@ export default {
     //编辑
     delivery(item) {
       this.$router.push({
-        path: 'tranManagementWarehouseInOutTaskEdit',
+        path: 'tranManagementWarehouseInOutTaskAdd',
         query: {
-          id: item.id,
-        },
-      })
-    },
-    //查看
-    warehousing(item) {
-      var free = 0
-      for (var i = 0; i < item.warehouseNumViewList.length; i++) {
-        free += Number(item.warehouseNumViewList[i].storage)
-      }
-      this.$router.push({
-        path: 'tranManagementWarehouseInOutTaskLook',
-        query: {
-          baseId: item.warehouseId,
-          positionId: item.binNumberId,
-          warehouseName: item.warehouseName,
-          binNumber: item.binNumber,
-          capacity: item.capacity - free,
+          relevanceId: item.relevanceId,
         },
       })
     },
+
     getSpanArr(data) {
       let that = this
 
@@ -307,24 +341,12 @@ export default {
     //查看//传参
     nocomplete(row) {
       this.$router.push({
-        path: 'tranManagementLook',
+        path: 'inOutWarehouseTaskEdit',
         query: {
-          id: row.id,
+          relevanceId: row.relevanceId,
         },
       })
     },
-    //查看
-    handleLook() {
-      this.$router.push({ path: 'tranManagementWarehouseInOutTaskLook' })
-    },
-    //添加
-    handleAdd() {
-      this.$router.push({ path: 'tranManagementWarehouseInOutTaskAdd' })
-    },
-    //编辑
-    handleEdit() {
-      this.$router.push({ path: 'tranManagementWarehouseInOutTaskEdit' })
-    },
     dateFormat(fmt, date) {
       let ret
       const opt = {
@@ -522,10 +544,7 @@ export default {
   width: 0%;
   margin-left: 25%;
 }
-/deep/.el-input--small .el-input__inner {
-  margin-left: -550px;
-  width: 300px;
-}
+
 .search {
   margin-left: -250px;
 }

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -22,19 +22,21 @@
       </el-col>
     </el-row>
     <div class="basicInformation">
-      <el-radio-group v-model="dataList.taskTypeKey">
-      <el-radio  label="1">出库</el-radio>
-      <el-radio label="2">入库</el-radio>
-      <el-radio label="3">移库</el-radio>
-      <el-radio label="4">退库并出库</el-radio>
+      <el-radio-group @change="tasktypechange" v-model="dataList.taskTypeKey">
+        <el-radio label="1">出库</el-radio>
+        <el-radio label="2">入库</el-radio>
+        <el-radio label="3">移库</el-radio>
+        <el-radio label="4">退库并出库</el-radio>
       </el-radio-group>
-      <div v-if='dataList.taskTypeKey!=2' class="center1">
-    <!--出库=-->      
-    <div class="small-title"><h3>出库任务({{inOutTaskNo}})</h3></div>
+      <div v-if="dataList.taskTypeKey != 2" class="center1">
+        <!--出库=-->
+        <div class="small-title">
+          <h3>出库任务({{ inOutTaskNo }})</h3>
+        </div>
         <el-form ref="dataList" :model="dataList" label-width="140px">
           <!-- 仓库名 -->
           <el-form-item label="仓库名">
-             <el-select
+            <el-select
               v-model="dataList.warehouseName"
               placeholder="请选择仓库名"
               class="typeselect"
@@ -50,7 +52,7 @@
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="出库类型">
-                <el-select
+            <el-select
               v-model="dataList.inOutType"
               placeholder="请选择出库类型"
               class="typeselect"
@@ -59,56 +61,61 @@
               <el-option
                 v-for="item in storageType"
                 :key="item.constKey"
-                v-if='dataList.taskTypeKey==1&&item.constValue!="移库出库"||dataList.taskTypeKey==3&&item.constValue=="移库出库"||dataList.taskTypeKey==4&&item.constValue=="销售出库"'
+                v-if="
+                  (dataList.taskTypeKey == 1 &&
+                    item.constValue != '移库出库') ||
+                  (dataList.taskTypeKey == 3 &&
+                    item.constValue == '移库出库') ||
+                  (dataList.taskTypeKey == 4 && item.constValue == '销售出库')
+                "
                 :label="item.constValue"
                 :value="item.constValue"
               />
             </el-select>
           </el-form-item>
-            <!-- 合同编号 -->
+          <!-- 合同编号 -->
           <el-form-item label="合同编号">
-                    <el-select
-            v-model="dataList.contractNo"
-            placeholder="请输入合同编号"
-            class="typeselect"
-          >
-            <el-option
-              v-for="item in contractNoList"
-              :key="item.constKey"
-              :label="item.contractNo"
-              :value="item.contractNo"
-            ></el-option>
-          </el-select>
+            <el-select
+              v-model="dataList.contractNo"
+              placeholder="请输入合同编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
           </el-form-item>
-            <!-- 货名 -->
-              <el-form-item label="货名">
+          <!-- 货名 -->
+          <el-form-item label="货名">
             <el-select
-            v-model="dataList.goodsName"
-            placeholder="货名"
-            class="typeselect"
-            @change="selectgoodsName"
-          >
-            <el-option
-              v-for="item in goodnameList"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
-            ></el-option>
-          </el-select>
-                </el-form-item>
+              v-model="dataList.goodsName"
+              placeholder="货名"
+              class="typeselect"
+              @change="selectgoodsName"
+            >
+              <el-option
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <!--重量（吨）-->
-            <el-form-item label="重量（吨）">
-                <el-input
-              @input="weightchange"
-              v-model="dataList.netWeight"
+          <el-form-item label="重量（吨）">
+            <el-input
+              v-model="dataList.weight"
               placeholder="请输入重量"
               maxlength="120"
               size="small"
             />
-            </el-form-item>
+          </el-form-item>
           <!-- 品级 -->
-            <el-form-item label="品级">
-                <el-select
+          <el-form-item label="品级">
+            <el-select
               v-model="dataList.grade"
               placeholder=""
               class="typeselect"
@@ -121,54 +128,51 @@
                 :value="item.constValue"
               />
             </el-select>
-            </el-form-item>
+          </el-form-item>
           <!--容重（克/升）>=-->
-            <el-form-item label="容重（克/升）>=">
-                    <el-input
-              @input="bulkDensitychange"
+          <el-form-item label="容重（克/升）>=">
+            <el-input
               v-model="dataList.bulkDensity"
               placeholder="请输入容重"
               maxlength="120"
               size="small"
             />
-            </el-form-item>  
-        <!--水分（%）<=--> 
-            <el-form-item label="水分（%）<=">
-                <el-input
-              @input="waterContentchange"
+          </el-form-item>
+          <!--水分（%）<=-->
+          <el-form-item label="水分（%）<=">
+            <el-input
               v-model="dataList.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
             />
-            </el-form-item>  
-          <!--单价(元/吨)-->  
-            <el-form-item label="单价(元/吨)">
-               <el-input
-              @input="unitPricechange"
+          </el-form-item>
+          <!--单价(元/吨)-->
+          <el-form-item label="单价(元/吨)">
+            <el-input
               v-model="dataList.unitPrice"
               placeholder="请输入单价"
               maxlength="120"
               size="small"
             />
-            </el-form-item>
+          </el-form-item>
           <!--预计出库日期-->
           <el-form-item
             label="预计出库日期"
             span="1"
-            prop="inOutDate"
+            prop="predictDate"
             class="deliverydate"
           >
             <el-date-picker
-              v-model="dataList.inOutDate"
+              v-model="dataList.predictDate"
               type="date"
               placeholder="请选择预计出库日期"
               value-format="yyyy-MM-dd"
             />
-          </el-form-item>   
+          </el-form-item>
           <!--经办人-->
-         <el-form-item label="出库经办人">
-              <el-select
+          <el-form-item label="出库经办人">
+            <el-select
               v-model="dataList.agent"
               placeholder="请选择经办人"
               filterable
@@ -183,27 +187,28 @@
               />
             </el-select>
           </el-form-item>
-        <!--业务描述=-->
-          <el-form-item label="业务描述" >
+          <!--业务描述=-->
+          <el-form-item label="业务描述">
             <el-input
               v-model="dataList.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
               maxlength="150"
               size="small"
             />
-          </el-form-item>           
-</el-form>
-</div>
-<div v-if='dataList.taskTypeKey!=1' class="center1">
-<div class="small-title"><h3>入库任务({{inOutTaskNo1}} )</h3></div>
-            <el-form ref="form" :model="form" label-width="140px">
+          </el-form-item>
+        </el-form>
+      </div>
+      <div v-if="dataList.taskTypeKey != 1" class="center1">
+        <div class="small-title">
+          <h3>入库任务({{ inOutTaskNo1 }} )</h3>
+        </div>
+        <el-form ref="form" :model="form" label-width="140px">
           <!-- 仓库名 -->
-         <el-form-item label="仓库名">
-             <el-select
-              v-model="dataList.warehouseName"
+          <el-form-item label="仓库名">
+            <el-select
+              v-model="dataList1.warehouseName"
               placeholder="请选择仓库名"
               class="typeselect"
-              @change="selectwarehouseName"
             >
               <el-option
                 v-for="item in warehouseNameList"
@@ -215,69 +220,74 @@
           </el-form-item>
           <!-- 出库类型 -->
           <el-form-item label="入库类型">
-                <el-select
-              v-model="dataList.inOutType"
+            <el-select
+              v-model="dataList1.inOutType"
               placeholder="请选择入库类型"
               class="typeselect"
-              @change="selectstorageType"
+              @change="selectstorageType1"
             >
               <el-option
-                v-for="item in storageType"
+                v-for="item in storageType1"
                 :key="item.constKey"
-                v-if='dataList.taskTypeKey==2&&item.constValue!="移库入库"||dataList.taskTypeKey==3&&item.constValue=="移库入库"||dataList.taskTypeKey==4&&item.constValue=="退库"'
+                v-if="
+                  (dataList1.taskTypeKey == 2 &&
+                    item.constValue != '移库入库') ||
+                  (dataList1.taskTypeKey == 3 &&
+                    item.constValue == '移库入库') ||
+                  (dataList1.taskTypeKey == 4 && item.constValue == '退库')
+                "
                 :label="item.constValue"
                 :value="item.constValue"
               />
             </el-select>
           </el-form-item>
-            <!-- 合同编号 -->
+          <!-- 合同编号 -->
           <el-form-item label="合同编号">
-                    <el-select
-            v-model="dataList.contractNo"
-            placeholder="请输入合同编号"
-            class="typeselect"
-          >
-            <el-option
-              v-for="item in contractNoList"
-              :key="item.constKey"
-              :label="item.contractNo"
-              :value="item.contractNo"
-            ></el-option>
-          </el-select>
+            <el-select
+              v-model="dataList1.contractNo"
+              placeholder="请输入合同编号"
+              class="typeselect"
+            >
+              <el-option
+                v-for="item in contractNoList"
+                :key="item.constKey"
+                :label="item.contractNo"
+                :value="item.contractNo"
+              ></el-option>
+            </el-select>
           </el-form-item>
-            <!-- 货名 -->
-              <el-form-item label="货名">
+          <!-- 货名 -->
+          <el-form-item label="货名">
             <el-select
-            v-model="dataList.goodsName"
-            placeholder="货名"
-            class="typeselect"
-            @change="selectgoodsName"
-          >
-            <el-option
-              v-for="item in goodnameList"
-              :key="item.constKey"
-              :label="item.constValue"
-              :value="item.constValue"
-            ></el-option>
-          </el-select>
-                </el-form-item>
+              v-model="dataList1.goodsName"
+              placeholder="货名"
+              class="typeselect"
+              @change="selectgoodsName1"
+            >
+              <el-option
+                v-for="item in goodnameList"
+                :key="item.constKey"
+                :label="item.constValue"
+                :value="item.constValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <!--重量（吨）-->
-            <el-form-item label="重量（吨）">
-                <el-input
-              @input="weightchange"
-              v-model="dataList.netWeight"
+          <el-form-item label="重量（吨）">
+            <el-input
+              v-model="dataList1.weight"
               placeholder="请输入重量"
               maxlength="120"
               size="small"
             />
-            </el-form-item>
+          </el-form-item>
           <!-- 品级 -->
-            <el-form-item label="品级">
-                <el-select
-              v-model="dataList.grade"
+          <el-form-item label="品级">
+            <el-select
+              v-model="dataList1.grade"
               placeholder=""
               class="typeselect"
-              @change="selectpackingMethod"
+              @change="selectpackingMethod1"
             >
               <el-option
                 v-for="item in gradeList"
@@ -286,59 +296,56 @@
                 :value="item.constValue"
               />
             </el-select>
-            </el-form-item>
+          </el-form-item>
           <!--容重（克/升）>=-->
-            <el-form-item label="容重（克/升）>=">
-                    <el-input
-              @input="bulkDensitychange"
-              v-model="dataList.bulkDensity"
+          <el-form-item label="容重（克/升）>=">
+            <el-input
+              v-model="dataList1.bulkDensity"
               placeholder="请输入容重"
               maxlength="120"
               size="small"
             />
-            </el-form-item>  
-        <!--水分（%）<=--> 
-            <el-form-item label="水分（%）<=">
-                <el-input
-              @input="waterContentchange"
-              v-model="dataList.waterContent"
+          </el-form-item>
+          <!--水分（%）<=-->
+          <el-form-item label="水分（%）<=">
+            <el-input
+              v-model="dataList1.waterContent"
               placeholder="请输入水分占比"
               maxlength="120"
               size="small"
             />
-            </el-form-item>  
-          <!--单价(元/吨)-->  
-            <el-form-item label="单价(元/吨)">
-               <el-input
-              @input="unitPricechange"
-              v-model="dataList.unitPrice"
+          </el-form-item>
+          <!--单价(元/吨)-->
+          <el-form-item label="单价(元/吨)">
+            <el-input
+              v-model="dataList1.unitPrice"
               placeholder="请输入单价"
               maxlength="120"
               size="small"
             />
-            </el-form-item>
+          </el-form-item>
           <!--预计出库日期-->
           <el-form-item
             label="预计入库日期"
             span="1"
-            prop="inOutDate"
+            prop="predictDate"
             class="deliverydate"
           >
             <el-date-picker
-              v-model="dataList.inOutDate"
+              v-model="dataList1.predictDate"
               type="date"
               placeholder="请选择预计入库日期"
               value-format="yyyy-MM-dd"
             />
-          </el-form-item>   
+          </el-form-item>
           <!--经办人-->
-         <el-form-item label="入库经办人">
-              <el-select
-              v-model="dataList.agent"
+          <el-form-item label="入库经办人">
+            <el-select
+              v-model="dataList1.agent"
               placeholder="请选择经办人"
               filterable
               :filter-method="dataFilter"
-              @change="selectstaff"
+              @change="selectstaff1"
             >
               <el-option
                 v-for="item in options"
@@ -348,33 +355,33 @@
               />
             </el-select>
           </el-form-item>
-        <!--业务描述=-->
-          <el-form-item label="业务描述" >
+          <!--业务描述=-->
+          <el-form-item label="业务描述">
             <el-input
-              v-model="dataList.businessDescribe"
+              v-model="dataList1.businessDescribe"
               placeholder="请输入业务描述，不超过150字"
               maxlength="150"
               size="small"
             />
-          </el-form-item>  
-</el-form>
-
-</div>
-      </div>      
-            <!-- 提交 -->
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button
-        class="bg-bottom"
-        type="primary"
-        size="small"
-        @click="submit()"
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
         >提交</el-button
       >
     </div>
   </div>
 </template>
 <script>
-import { getwarehousename,xialaNo,addoreditoutput  } from '@/model/tasksport/index'
+import {
+  getwarehousename,
+  xialaNo,
+  addoreditoutput,
+  outexamine,
+} from '@/model/tasksport/index'
 import { packList } from '@/model/contarct/index'
 import { pullDown, getstaff } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
@@ -413,7 +420,7 @@ export default {
       showType: true,
       // 年
       year: '',
-      contractNoList:[],
+      contractNoList: [],
       deptBudgetTotal: 0,
       readonly: true,
       currentPage: 1,
@@ -436,12 +443,9 @@ export default {
       // 提交类型
       submitType: true,
       status: [],
-      weightchange: [],
-
       unitPricechange: [],
       warehouseNameList: [],
       warehouseNameList1: [],
-      bulkDensitychange: [],
       waterContentchange: [],
       appendixIdsAdd: '',
       uploadSuccess: {},
@@ -470,7 +474,8 @@ export default {
       contractList: [],
       inOutTaskNo: '',
       inOutTaskNo1: '',
-      dataList: {taskTypeKey:'1'},
+      dataList: { taskTypeKey: '1' },
+      dataList1: { taskTypeKey: '1' },
       historyList: [],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -488,6 +493,9 @@ export default {
     revert() {
       this.$router.go(-1)
     },
+    returnsales() {
+      this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+    },
     // 获取当前年月日
     getdate() {
       var date = new Date()
@@ -542,35 +550,47 @@ export default {
         }
       }
     },
-    requestadd(){
-this.$refs.dataList.validate((valid) => {
-            if (valid) {
-              addoreditoutput(this.dataList)
-                .toPromise()
-                .then((response) => {
-                  this.$message.success('添加成功')
-                  // this.$router.push({ path: 'warehouseManagementList' })
-                })
-            } else {
-              EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              return false
-            }
-          })
+    selectstaff1(e) {
+      for (var i = 0; i < this.staffList.length; i++) {
+        if (this.staffList[i].staffName == e) {
+          this.dataList1.agentKey = this.staffList[i].staffId
+        }
+      }
+    },
+    requestadd(list, status) {
+          list.compId = sessionStorage.getItem('ws-pf_compId')
+          list.publisher =
+            sessionStorage.getItem('ws-pf_roleName') +
+            sessionStorage.getItem('ws-pf_staffName')
+          addoreditoutput(list)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.$router.push({ path: 'tranManagementWarehouseInOutTask' })
+            })
     },
     //提交按钮
     submit() {
-      if(this.dataList.taskTypeKey==1){
-        this.dataList.inOutTaskNo=this.inOutTaskNo
-        this.requestadd()
-      }else if(this.dataList.taskTypeKey==2){
-        this.dataList.inOutTaskNo=this.inOutTaskNo1
-        this.requestadd()
-      }
-      else if(this.dataList.taskTypeKey==3||this.dataList.taskTypeKey==4){
-        this.dataList.inOutTaskNo=this.inOutTaskNo
-        this.requestadd()
-        this.dataList.inOutTaskNo=this.inOutTaskNo1
-        this.requestadd()
+      this.dataList.inOutFlag=1
+      this.dataList1.inOutFlag=2
+      if (this.dataList.taskTypeKey == 1) {
+        
+        this.dataList.inOutTaskNo = this.inOutTaskNo
+        this.requestadd(this.dataList)
+      } else if (this.dataList1.taskTypeKey == 2) {
+        this.dataList1.inOutTaskNo = this.inOutTaskNo1
+        this.requestadd(this.dataList1)
+      } else if (
+        this.dataList.taskTypeKey == 3 ||
+        this.dataList.taskTypeKey == 4
+      ) {
+        this.dataList.inOutTaskNo = this.inOutTaskNo
+        this.dataList.relevanceId = this.GetRandomNum(100000, 999999)
+
+        this.requestadd(this.dataList, 'repetition')
+        this.dataList1.inOutTaskNo = this.inOutTaskNo1
+        this.dataList1.relevanceId = this.dataList.relevanceId
+        this.requestadd(this.dataList1, 'repetition')
       }
     },
     selectwarehouseName() {},
@@ -589,13 +609,19 @@ this.$refs.dataList.validate((valid) => {
       }
     },
     selectgoodsName(e) {
-      console.log(11111)
       for (var i = 0; i < this.goodnameList.length; i++) {
         if (this.goodnameList[i].constValue == e) {
           this.dataList.goodsNameKey = this.goodnameList[i].constKey
         }
       }
     },
+    selectgoodsName1(e) {
+      for (var i = 0; i < this.goodnameList.length; i++) {
+        if (this.goodnameList[i].constValue == e) {
+          this.dataList1.goodsNameKey = this.goodnameList[i].constKey
+        }
+      }
+    },
     selectpackingMethod(e) {
       for (var i = 0; i < this.packtypeList.length; i++) {
         if (this.packtypeList[i].constValue == e) {
@@ -603,6 +629,13 @@ this.$refs.dataList.validate((valid) => {
         }
       }
     },
+    selectpackingMethod1(e) {
+      for (var i = 0; i < this.packtypeList.length; i++) {
+        if (this.packtypeList[i].constValue == e) {
+          this.dataList1.packingMethodKey = this.packtypeList[i].constKey
+        }
+      }
+    },
     selectstorageType(e) {
       for (var i = 0; i < this.storageType.length; i++) {
         if (this.storageType[i].constValue == e) {
@@ -610,6 +643,13 @@ this.$refs.dataList.validate((valid) => {
         }
       }
     },
+    selectstorageType1(e) {
+      for (var i = 0; i < this.storageType1.length; i++) {
+        if (this.storageType1[i].constValue == e) {
+          this.dataList1.inOutTypeKey = this.storageType1[i].constKey
+        }
+      }
+    },
     handleClose() {
       this.accessoryTFs = false
     },
@@ -618,16 +658,15 @@ this.$refs.dataList.validate((valid) => {
       this.pageSize = val
       this.getList()
     },
-    businessDescriptionchange(e){
-console.log(e)
+    businessDescriptionchange(e) {
+      console.log(e)
     },
     handleCurrentChange(val) {
       this.currentPage = val
       console.log(`当前页: ${val}`)
       this.getList()
     },
-    getList() {
-      console.log(1111)
+    tasknumber() {
       if (this.dataList.taskTypeKey == 1) {
         this.inOutTaskNo = 'CK' + this.getdate() + this.verifyinit()
       } else if (this.dataList.taskTypeKey == 2) {
@@ -639,6 +678,33 @@ console.log(e)
         this.inOutTaskNo = 'TCC' + this.getdate() + this.verifyinit()
         this.inOutTaskNo1 = 'TCR' + this.getdate() + this.verifyinit()
       }
+    },
+    tasktypechange(e) {
+      if (!this.$route.query.relevanceId) {
+        this.tasknumber()
+      }
+      this.dataList1.taskTypeKey = e
+    },
+    GetRandomNum(Min, Max) {
+      var Range = Max - Min
+      var Rand = Math.random()
+      return Min + Math.round(Rand * Range)
+    },
+    getList() {
+      if (this.$route.query.relevanceId) {
+        outexamine({ relevanceId: this.$route.query.relevanceId })
+          .toPromise()
+          .then((response) => {
+            if (response.length > 1) {
+              this.dataList = response[0]
+              this.dataList1 = response[1]
+            } else {
+              this.dataList = response[0]
+            }
+          })
+      } else {
+        this.tasknumber()
+      }
       // 货名
       pullDown({ constId: 'CON2' })
         .toPromise()
@@ -661,7 +727,7 @@ console.log(e)
         .then((response) => {
           this.storageType1 = response
         })
-        xialaNo({
+      xialaNo({
         compId: this.compId,
       })
         .toPromise()

src/views/tranManagement/tranManagementDriver.vue

@@ -55,8 +55,6 @@
             alt=""
           />
         </ws-button>
-
-        <ws-button type="primary" @click="handleLook()">查找</ws-button>
       </template>
     </BaseHeaderLayout>
     <div>
@@ -165,9 +163,9 @@
         </el-table-column>
         <el-table-column prop="numberCard" label="身份证号" width="200">
         </el-table-column>
-        <el-table-column prop="driverPhone" label="手机号" width="120">
+        <el-table-column prop="driverPhone" label="手机号" width="160">
         </el-table-column>
-        <el-table-column prop="carNumber" label="车牌号" width="120">
+        <el-table-column prop="carNumber" label="车牌号" width="160">
           <template scope="scope">
             <ws-select
               v-model="scope.row.carNumber"
@@ -184,15 +182,15 @@
             </ws-select>
           </template>
         </el-table-column>
-        <el-table-column prop="binNumber" label="常驻城市" width="120">
+        <el-table-column prop="binNumber" label="常驻城市" width="160">
           <template slot-scope="scope">
             {{ scope.row.residentCityProvincial
             }}{{ scope.row.residentCityMunicipal }}
           </template>
         </el-table-column>
-        <el-table-column prop="carModel" label="车型" width="80">
+        <el-table-column prop="carModel" label="车型" width="120">
         </el-table-column>
-        <el-table-column prop="carLength" label="车长" width="80">
+        <el-table-column prop="carLength" label="车长" width="120">
         </el-table-column>
         <el-table-column label="结款账户" width="120">
           <template slot-scope="scope">
@@ -241,24 +239,25 @@
         </el-table-column>
         <el-table-column prop="address" label="操作" width="500">
           <template slot-scope="scope">
-            <el-button size="medium" type="text" @click="look(scope.row)"
+            <el-button size="medium" type="text" class="record" @click="look(scope.row)"
               >查看</el-button
             >
-            <el-button size="medium" type="text" @click="edit(scope.row)"
+            <el-button size="medium" type="text" class="record" @click="edit(scope.row)"
               >编辑</el-button
             >
-            <el-button size="medium" type="text" @click="deletes(scope.row)"
+            <el-button size="medium" type="text" class="record" @click="deletes(scope.row)"
               >删除</el-button
             >
             <el-button
               v-if="scope.row.disableStatusFlag != 1"
               size="medium"
+              class="record"
               type="text"
               @click="stop(scope.row)"
               >禁用</el-button
             >
             <el-tooltip
-              class="item"
+              class="item record"
               effect="dark"
               :content="scope.row.disableReasons"
               placement="right-start"
@@ -707,7 +706,7 @@ export default {
   display: none;
 }
 
-/deep/.el-pagination{
+/deep/.el-pagination {
   text-align: center;
 }
 .ws-info-table {
@@ -721,6 +720,8 @@ export default {
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   text-align: center;
   background: #f6f7fc;
+  color: #8890b1;
+  font-size: 12px;
 }
 
 /deep/.ws-info-table .el-form-item.company,
@@ -741,10 +742,33 @@ export default {
 /deep/.el-table .el-table__body .cell {
   text-align: center;
 }
+.el-table th.is-leaf,
+.el-table td {
+  border-right: 1px solid #eee;
+}
 .el-button--text {
   color: #5878e8;
 }
 .el-button--primary {
   background: #5878e8;
 }
+//操作按钮
+.record,
+.adjustment {
+  display: inline-block;
+  color: #5878e8;
+  padding: 0 4px !important;
+  position: relative;
+  font-size: 14px;
+}
+.record:after {
+  position: absolute;
+  content: '';
+  display: block;
+  top: 9px;
+  right: -7px;
+  width: 1px;
+  height: 12px;
+  background: #e9ecf7;
+}
 </style>

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

@@ -92,7 +92,6 @@
         <span v-if="age && age > 60" class="big">{{ age }}岁</span>
       </div>
     </ws-form>
-
     <ws-form
       ref="deptBudgetList"
       :rules="mainReportAdd"
@@ -105,7 +104,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 +208,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 +224,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 +397,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 +886,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 +938,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 +1012,6 @@ export default {
 .el-form-item__label {
   text-align: center;
 }
-.el-table {
-  width: 1240px;
-}
 .ce {
   width: 900px;
   margin: 0 auto;
@@ -1062,15 +1061,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 +1080,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 +1092,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 +1163,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/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>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -10,8 +10,12 @@
         <ws-button class="but" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
-      <template slot="left">
-        <ws-date-picker
+      <template slot="right">
+        <div>
+          <span style="display: inline-block; width: 300px; color: #8890B1;">接单日期</span>
+        </div>
+         
+        <!-- <ws-date-picker
           v-model="deptBudgetList.inOutDate"
           type="date"
           placeholder="请选择开始日期"
@@ -23,7 +27,18 @@
           type="date"
           placeholder="请选择结束日期"
           value-format="yyyy-MM-dd"
-        />
+        /> -->
+        <el-date-picker
+          v-model="deptBudgetList.inOutDate"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+         
+        >
+        </el-date-picker>
         <ws-input
           v-model="searchKeyWord"
           placeholder="可按照合同编号、买方名称、卖方名称进行查找"
@@ -198,6 +213,7 @@ export default {
       contractType: 2,
       tranTypeKey: 2,
       searchType: 1,
+      searchTypeOne : 1,
       // 提交类型
       submitType: true,
       size: 10,
@@ -291,7 +307,7 @@ export default {
       })
     },
      statusquery(status){
-      this.searchType = status
+      this.searchTypeOne = status
       this.getList()
     },
     dateFormat(fmt, date) {
@@ -333,7 +349,7 @@ export default {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         contractType: this.contractType,
-          searchType: this.searchType,
+          searchTypeOne :this.searchTypeOne,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
       })

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -1,7 +1,7 @@
 //火运调度
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="20">
+    <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
         <ws-button class="but" type="primary" @click="statusquery(1)">
           执行中</ws-button
@@ -10,9 +10,12 @@
         <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
+      <template slot="right">
+        <div>
+           <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
+        </div>
+ 
+        <!-- <ws-date-picker
           v-model="deptBudgetList.inOutDate"
           type="date"
           placeholder="请选择开始日期"
@@ -24,7 +27,17 @@
           type="date"
           placeholder="请选择结束日期"
           value-format="yyyy-MM-dd"
-        />
+        /> -->
+         <el-date-picker
+          v-model="deptBudgetList.inOutDate"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
         <ws-input
           v-model="searchKeyWord"
           placeholder="可按照合同编号、买方名称、卖方名称进行查找"
@@ -33,6 +46,7 @@
           type="input"
           class="findValue"
         ></ws-input>
+
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()"
           ><img

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"
@@ -448,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

@@ -1,18 +1,21 @@
 //汽运调度
 <template>
   <div>
-    <BaseHeaderLayout :leftSpan="20">
+    <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" type="primary" @click="statusquery(1)">
+        <ws-button class="but" :type="status==1?'primary':''" @click="changestatus(1)">
           执行中</ws-button
         >
-        <ws-button class="but" @click="statusquery(2)">已完成</ws-button>
-        <ws-button class="but" @click="statusquery()">全部任务</ws-button>
+        <ws-button class="but" :type="status1==1?'primary':''" @click="changestatus(2)">已完成</ws-button>
+        <ws-button class="but" :type="status2==1?'primary':''" @click="changestatus(1)">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
-      <template slot="left">
-        <span style="display: inline-block; width: 290px;color: #8890B1;">接单日期</span>
-        <ws-date-picker
+      <template slot="right">
+        <div>
+          <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
+        </div>
+        
+        <!-- <ws-date-picker
           v-model="deptBudgetList.inOutDate"
           type="date"
           placeholder="请选择开始日期"
@@ -24,7 +27,18 @@
           type="date"
           placeholder="请选择结束日期"
           value-format="yyyy-MM-dd"
-        />
+        /> -->
+        <el-date-picker
+          v-model="deptBudgetList.inOutDate"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+
+        >
+        </el-date-picker>
         <ws-input
           v-model="searchKeyWord"
           placeholder="可按发货人、收货人、任务编号查找"
@@ -73,7 +87,6 @@
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
         </el-table-column>
-        <el-table-column prop="receivingDate" label="签到"> </el-table-column>
         <el-table-column prop="status" label="状态">
           <template slot-scope="scope">
             <el-popover
@@ -539,6 +552,7 @@ export default {
 }
 .but {
   margin-top: 150px;
+  margin-left: 110px;
 }
 .el-input--small .el-input__inner {
   margin-left: 20px;

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/warehouseManagementList.vue

@@ -169,7 +169,7 @@
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
             >
-               {{ item.goodsName}}({{item.inNetWeight}})
+               {{ item.goodsName}}({{item.inNetWeight == null ? 0 : item.inNetWeight}})
             </div>
           </template>
         </el-table-column>
@@ -179,7 +179,7 @@
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
             >
-             {{ item.goodsName}}({{item.outNetWeight}})
+             {{ item.goodsName}}({{item.outNetWeight == null ? 0:item.outNetWeight}})
             </div>
           </template>
         </el-table-column>
@@ -188,8 +188,8 @@
             <div
               style="height: 24px"
               v-for="(item, i) in scope.row.warehouseNumViewList"
-            >
-              {{ item.inNetWeight - item.outNetWeight }}
+            >{{ item.goodsName}}
+             ({{ item.inNetWeight - item.outNetWeight }}) 
 
               {{item.storage }}
             </div>