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

src/views/contractManagement/purchaseContractExamine.vue

@@ -159,8 +159,9 @@
         <h3>流程信息</h3>
       </div>
       <ws-info-table>
-        <ws-form-item label="合同收入（元）" span="1" prop="goodsNameKey">
-          {{ deptBudgetList.contractProcessInfo.goodsNameKey }}
+         <!--已付款（元）-->
+        <ws-form-item label="已付款（元）" span="1" prop="goodsNameKey">
+          {{deptBudgetList.contractProcessInfo.goodsNameKey}}
         </ws-form-item>
         <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
           {{ deptBudgetList.contractProcessInfo.goodsName }}
@@ -171,9 +172,6 @@
         <ws-form-item label="未开发票（元）" span="1" prop="impurity"
           >{{ deptBudgetList.contractProcessInfo.impurity }}
         </ws-form-item>
-        <ws-form-item label="未回款（元）" span="1" prop="mildewGrain"
-          >{{ deptBudgetList.contractProcessInfo.mildewGrain }}
-        </ws-form-item>
         <ws-form-item
           label="已完成发运量（吨）"
           span="1"

src/views/taskManagement/moveWarehouseTask.vue

@@ -54,7 +54,7 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="moveTaskNo" label="移库任务编号" width="80"></el-table-column>
+        <el-table-column prop="moveTaskNo" label="移库任务编号" width="120"></el-table-column>
         <el-table-column prop="sendWarehouse" label="发货库"> </el-table-column>
         <el-table-column prop="receiveWarehouse" label="收货库"> </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>

src/views/taskManagement/moveWarehouseTaskLook.vue

@@ -67,7 +67,8 @@
           {{ deptBudgetList.predictDate }}
         </ws-form-item>
         <!--货物信息-->
-        <span style="line-height: 50px; margin-left: 16px; color: #8890b1"
+        
+        <span style="line-height: 50px; text-align: center; color: #8890b1"
           >货物信息</span
         >
         <!-- <ws-form-item label="货物信息" span="1" prop="sendDetailedAddress">
@@ -78,7 +79,7 @@
         <el-input placeholder="请输入内容" :disabled="true"> </el-input>
         <el-input placeholder="请输入内容" :disabled="true"> </el-input>
         <el-input placeholder="请输入内容" :disabled="true"> </el-input>
-        <span style="line-height: 40px; margin-left: 16px; color: #8890b1"
+        <span style="line-height: 40px; text-align: center; color: #8890b1"
           >业务描述</span
         >
         <!--业务描述-->
@@ -89,6 +90,7 @@
           placeholder="请输入备注信息，不超过200字"
           maxlength="200"
         />
+        
       </ws-info-table>
 
       <div class="small-title" style="font-size: 16px">实际流转数量</div>
@@ -785,7 +787,7 @@ export default {
 }
 //输入框
 /deep/.el-input {
-  width: 14.6%;
+  width: 15%;
   margin-left: 10px;
 }
 /deep/.is-disabled .el-input__inner {
@@ -796,6 +798,7 @@ export default {
 .line {
   width: 100%;
 }
+
 //业务描述
 /deep/.el-textarea {
   width: 90%;

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -183,7 +183,7 @@
           ></el-input>
         </el-form-item>
         <div class="check-box">
-          <span class="check-box" >运输方式</span>
+          <span class="check-box">运输方式</span>
           <el-checkbox-group v-model="checkList" prop="tranType">
             <el-checkbox label="汽运"></el-checkbox>
             <el-checkbox label="火运"></el-checkbox>

src/views/tranManagement/tranManagementDriver.vue

@@ -6,23 +6,9 @@
         <ws-button type="primary" @click="handleAdd()">添加</ws-button>
       </template>
       <template slot="left">
-        <!-- <ws-select
-          v-model="searchTypeText"
-          placeholder="请选择所在城市"
-          :value="searchType"
-          @change="selecttaskType"
-        >
-        <ws-option
-            v-for="item in options_"
-            :key="item.value"
-            :label="item.label"
-            :value="item.label"
-          />
-        </ws-select> -->
         <span style="display: inline-block; width: 60px; color: #8890b1"
           >城市</span
         >
-
         <el-cascader
           :options="options_"
           v-model="searchTypeText"

src/views/tranManagement/tranManagementDriverAdd.vue

@@ -937,35 +937,35 @@ export default {
           this.deptBudgetList.addressUrl = arr.toString()
           this.deptBudgetList.driverCarInfoList = this.freightspace
           this.deptBudgetList.driverPayeeInfoList = this.freightspace1
-          // addDriver(this.deptBudgetList)
-          //   .toPromise()
-          //   .then((response) => {
-          //     this.$message.success('添加成功')
-          //     this.deptBudgetList = {}
-          //     this.freightspace = [
-          //       {
-          //         carNumber: '',
-          //         carModel: '高栏',
-          //         carModelKey: '1',
-          //         carLength: '13',
-          //         carLengthKey: '1',
-          //         carLoad: '',
-          //         yearManufacture: '',
-          //       },
-          //     ]
-          //     this.freightspace1 = [
-          //       {
-          //         accountTypeFlag: '1',
-          //         payeeName: '',
-          //         payeeNumberCard: '',
-          //         compName: '',
-          //         bankDeposit: '',
-          //         addressUrlArray: [],
-          //         bankCard: '',
-          //       },
-          //     ]
-          //     this.$router.push({ path: 'tranManagementDriver' })
-          //   })
+          addDriver(this.deptBudgetList)
+            .toPromise()
+            .then((response) => {
+              this.$message.success('添加成功')
+              this.deptBudgetList = {}
+              this.freightspace = [
+                {
+                  carNumber: '',
+                  carModel: '高栏',
+                  carModelKey: '1',
+                  carLength: '13',
+                  carLengthKey: '1',
+                  carLoad: '',
+                  yearManufacture: '',
+                },
+              ]
+              this.freightspace1 = [
+                {
+                  accountTypeFlag: '1',
+                  payeeName: '',
+                  payeeNumberCard: '',
+                  compName: '',
+                  bankDeposit: '',
+                  addressUrlArray: [],
+                  bankCard: '',
+                },
+              ]
+              this.$router.push({ path: 'tranManagementDriver' })
+            })
         } else {
           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
           return false

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -21,14 +21,13 @@
         >
       </el-col>
     </el-row>
-
     <ws-form
       class="position"
       ref="deptBudgetList"
       :rules="rules"
       :model="deptBudgetList"
     >
-      <div class="small-title" style="font-size: 16px;">任务详情</div>
+      <div class="small-title" style="font-size: 16px">任务详情</div>
       <ws-info-table>
         <!--任务编号-->
         <ws-form-item label="任务编号" span="1" prop="processNo">
@@ -90,7 +89,7 @@
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
       </ws-info-table>
-      <div class="small-title" style="font-size: 16px;">装车详情</div>
+      <div class="small-title" style="font-size: 16px">装车详情</div>
       <div class="liaison">
         <div
           style="width: 100%"
@@ -99,8 +98,15 @@
           :key="index"
         >
           <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>
+            <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="姓名："
@@ -115,7 +121,7 @@
             <!--司机-->
 
             <ws-form-item
-              label="姓名"
+              label="姓名："
               span="1"
               prop="driver"
               v-show="item.temporaryDriverFlag != 0"
@@ -177,58 +183,54 @@
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <template slot-scope="scope">
                 <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="
-                    vertical-align: text-top;
-                    position: relative;
-                    top: -1px;
+                  action="https://www.zthymaoyi.com/upload/admin"
+                  :show-file-list="false"
+                  :on-success="
+                    (res, file) => {
+                      uploadSuccessHandle1(index, res, file)
+                    }
                   "
-                  src="../../../public/img/fujian.png"
-                  alt=""
-                />
-              </el-upload>
-                <div v-show="item.temporaryDriverFlag == 0">
+                  class="avatar-uploader"
+                  accept=".jpg, .jpeg, .png, .gif"
+                  ><img
+                    width="18"
+                    height="20"
+                    style="
+                      vertical-align: text-top;
+                      position: relative;
+                    "
+                    src="../../../public/img/fujian.png"
+                    alt=""
+                  />
+                </el-upload>
+                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
+                  {{ item.signStatus }}
+                </div>
+                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
                   {{ item.signStatus }}
                 </div>
               </template>
             </ws-form-item>
-            
+
             <span
-            v-show="item.temporaryDriverFlag != 0"
-                width="22"
-                height="22"
-                class="del"
-                @click="del(index)"
-                src="../../../public/img/del.png"
-                alt=""
-                >×</span
-              >
+              v-show="item.temporaryDriverFlag != 0"
+              width="22"
+              height="22"
+              class="del"
+              @click="del(index)"
+              src="../../../public/img/del.png"
+              alt=""
+              >×</span
+            >
           </ws-info-table>
         </div>
       </div>
-      <div style="text-align: right;color: #8890B1;font-size: 16px;">
+      <div style="text-align: right; color: #8890b1; font-size: 16px">
         合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
       </div>
       <el-button class="add bg-bottom" type="primary" size="small" @click="add">
-         <img
-          width="22"
-          height="22"
-          @click="add"
-          src="../../../public/img/add.png"
-          alt=""
-        />
-       <div class="spans"> 添加临时用车</div></el-button
+        <img width="22" height="22" src="../../../public/img/add.png" alt="" />
+        <div class="spans">添加临时用车</div></el-button
       >
     </ws-form>
     <!-- 提交 -->
@@ -264,7 +266,7 @@
 </template>
 <script>
 import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import { seeCat, packList, feedback ,getbank} from '@/model/transport/index'
+import { seeCat, packList, feedback, getbank } from '@/model/transport/index'
 import { getstaff } from '@/model/warehouse/index'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
@@ -349,11 +351,10 @@ export default {
       appendixIdsAdd: '',
     }
   },
-  mounted() {
+  activated() {
     this.deptBudgetList.id = this.$route.query.id
     this.getList()
   },
-
   computed: {
     totalStorage: function () {
       var maxStorage = 0
@@ -363,13 +364,17 @@ export default {
       return maxStorage
     },
     total: function () {
-      var maxStorage = 0
-      for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-        maxStorage += Number(
-          this.deptBudgetList.tranCarInfoList[i].loadNetWeight
-        )
+      if (this.deptBudgetList.tranCarInfoList != null) {
+        var maxStorage = 0
+        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          maxStorage += Number(
+            this.deptBudgetList.tranCarInfoList[i].loadNetWeight
+          )
+        }
+        return maxStorage
+      } else {
+        return 0
       }
-      return maxStorage
     },
   },
   methods: {
@@ -437,6 +442,7 @@ export default {
       this.deptBudgetList = {}
       this.freightspace = {}
       this.selectedOptions = ''
+      this.deptBudgetList.tranCarInfoList = []
       this.$router.push({ path: 'tranManagementTransporHairRespond' })
     },
     // confirmPosition() {
@@ -450,37 +456,36 @@ export default {
       this.accessoryTFs = false
     },
     submit() {
-      for(var i = 0 ; i < this.freightspace.length ; i++){
-        if(this.freightspace[i].temporaryDriverFlag != 0){
-          if(!this.freightspace[i].driver){
+      for (var i = 0; i < this.freightspace.length; i++) {
+        if (this.freightspace[i].temporaryDriverFlag != 0) {
+          if (!this.freightspace[i].driver) {
             this.$message({
-              message : '司机姓名不能为空！',
-              type: 'warning'
+              message: '司机姓名不能为空！',
+              type: 'warning',
             })
             return
           }
-          if(!this.freightspace[i].driverPhone){
+          if (!this.freightspace[i].driverPhone) {
             this.$message({
-              message:'司机电话不能为空！',
-              type: "warning"
+              message: '司机电话不能为空！',
+              type: 'warning',
             })
             return
           }
-          if(!this.freightspace[i].carNo){
+          if (!this.freightspace[i].carNo) {
             this.$message({
-              message : "车牌号不能为空！",
-              type:"warning"
+              message: '车牌号不能为空！',
+              type: 'warning',
             })
             return
           }
-          if(!this.freightspace[i].loadNetWeight){
+          if (!this.freightspace[i].loadNetWeight) {
             this.$message({
-              message:"装载净重不能为空！",
-              type: "warning"
+              message: '装载净重不能为空！',
+              type: 'warning',
             })
             return
           }
-
         }
       }
       this.$confirm(`提交成功后提醒司机及时签订运输合同，确定提交装车信息？`, {
@@ -916,11 +921,11 @@ export default {
   border-top: 0px;
 }
 .ws-info-table .el-form-item .el-form-item__content {
-border: none;
+  border: none;
 }
 /deep/.ws-info-table .el-form-item {
- border: none;
- height: 50px;
+  border: none;
+  height: 50px;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__content {
   background: #f5f7fa;
@@ -957,26 +962,26 @@ border: none;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 30%;
-  background: #F6F7FC;
+  background: #f6f7fc;
 }
 /deep/.liaison .flex {
   display: contents;
 }
-/deep/.liaison .ws-info-table{
-  background: #F6F7FC;
-border-radius: 4px;
-border: 1px solid #D8DCE6;
-margin-top: 20px;
+/deep/.liaison .ws-info-table {
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
 }
-.catNos{
+.catNos {
   width: 100%;
   height: 30px;
   margin-top: 10px;
   margin-left: 20px;
   font-size: 14px;
 }
-.catNosCor{
-  color: #5473E8;
+.catNosCor {
+  color: #5473e8;
 }
 .add {
   width: 130px;
@@ -998,4 +1003,24 @@ margin-top: 20px;
   height: 20px;
   line-height: 18px;
 }
+.signStatus {
+  height: 25px;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 90px;
+  color: #ffffff;
+  background: #c4cada;
+  line-height: 24px;
+}
+.signStatus1 {
+  height: 25px;
+  background: #e6ebff;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 90px;
+  color: #5473E8;
+  line-height: 24px;
+}
 </style>

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -1,4 +1,4 @@
-//反馈
+//反馈查看
 <template>
   <div class="container">
     <el-row>
@@ -102,7 +102,7 @@
             <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" v-show="freightspace[index].temporaryDriverFlag == 0">
+            <ws-form-item label="姓名:" span="1" prop="driver">
               <span>{{ item.driver }} </span>
             </ws-form-item>
 
@@ -115,13 +115,9 @@
               <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">
@@ -137,7 +133,10 @@
                   @click="fujian(scope.row)"
                   alt=""
                 />
-                <div v-show="item.temporaryDriverFlag == 0">
+                 <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
+                  {{ item.signStatus }}
+                </div>
+                <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
                   {{ item.signStatus }}
                 </div>
               </template>
@@ -160,24 +159,27 @@
         >关闭</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"
-      />
+      <p>查看附件</p>
+      <div
+        style="display: inline-block; margin: 5px"
+        v-for="item in appendixIdss"
+      >
+        <img width="100" height="100" :src="item" alt="" />
+      </div>
+    </WinseaContentModal>
+    <WinseaContentModal
+      v-model="accesscard"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose1"
+    >
+      <p>查看附件</p>
+      <img width="100" height="100" :src="accessurl" alt="" />
     </WinseaContentModal>
   </div>
 </template>
@@ -249,12 +251,16 @@ export default {
       name: '',
       staffList: [],
       options: [],
-      carModel: [],
+      // carModel: [],
       tranCarInfoList: {},
       //上传
       accessoryTFs: false,
-      fileList: [],
-      appendixIdsAdd: '',
+      accesscard : false,
+      accessurl: '',
+      // fileList: [],
+      // appendixIdsAdd: '',
+      //附件
+      appendixIdss:[],
     }
   },
   mounted() {
@@ -271,6 +277,7 @@ export default {
       return maxStorage
     },
     total: function () {
+      if (this.deptBudgetList.tranCarInfoList != null) {
       var maxStorage = 0
       for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
         maxStorage += Number(
@@ -278,6 +285,9 @@ export default {
         )
       }
       return maxStorage
+      }else{
+        return 0
+      }
     },
     label1: function () {
       //  for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
@@ -295,32 +305,6 @@ export default {
     },
   },
   methods: {
-    dataFilter(val) {
-      this.deptBudgetList.personCharge = val
-      if (val) {
-        this.options = this.staffList.filter((item) => {
-          if (
-            !!~item.staffName.indexOf(val) ||
-            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
-          }
-        })
-      } else {
-        this.options = this.staffList
-      }
-    },
-    selectstaff(e) {
-      for (var i = 0; i < this.staffList.length; i++) {
-        if (this.staffList[i].staffName == e) {
-          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
-          this.freightspace[i].driverPhone = this.staffList[i].staffMobilePhone
-          // this.deptBudgetList.tranCarInfoList[i].driverPhone = this.staffList[i].staffMobilePhone
-          console.log(this.freightspace[i].driverPhone, 'dianhu')
-          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
-        }
-      }
-    },
     marker: function (item) {
       this.deptBudgetList.warehousePositioning =
         item.lnglat.lat + ',' + item.lnglat.lng
@@ -337,9 +321,9 @@ export default {
     handleClose() {
       this.dialogViewSpareMoney = false
     },
-
-    //下拉司机姓名改变事件
-    selectdriver() {},
+      handleClose1() {
+      this.accesscard = false
+    },
     handleChange(value) {
       this.selectedOptions = value
     },
@@ -373,27 +357,17 @@ export default {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
             }
+            if (response.records[i].addressUrl != null) {
+              response.records[i].addressUrlArray =
+                response.records[i].addressUrl.split(',')
+              this.fileList[i] = response.records[i].addressUrl.split(',')
+            } else {
+              response.records[i].addressUrlArray = []
+            }
           }
-        })
-      //司机姓名下拉
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
-        .toPromise()
-        .then((response) => {
-          this.options = response
-          this.staffList = response
-        })
-      //车型
-      packList({ constId: 'TRAN5' })
-        .toPromise()
-        .then((response) => {
-          this.carModel = response
+          
         })
     },
-    handleExamine() {},
-    approve() {},
-    // returnsales() {
-    //   this.$router.push({ path: 'purchaseContract' })
-    // },
     selectChapterTwo(e) {
       for (var i = 0; i < this.ChapterTwoList.length; i++) {
         if (this.ChapterTwoList[i].constValue == e) {
@@ -432,8 +406,8 @@ export default {
     //上传
     fujian(row) {
       if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
+        row.addressUrl === null ||
+        row.addressUrl === ''
       ) {
         EventBus.$emit(
           'warning',
@@ -444,6 +418,7 @@ export default {
       }
       this.appendixIdss = row.receiveAttachmentPath
     },
+
   },
 }
 </script>
@@ -522,7 +497,6 @@ export default {
   width: 100px;
   text-align: center;
   background: #fff;
-  // border: 1px solid #cdd2dc;
 }
 .button-container {
   display: flex;
@@ -600,8 +574,7 @@ export default {
   display: inline-block;
 }
 .center {
-  width: 900px;
-  margin: 0 auto;
+  margin-right: 50px;
 }
 .el-form-item {
   width: 50%;
@@ -770,4 +743,24 @@ margin-top: 20px;
 .catNosCor{
   color: #5473E8;
 }
+.signStatus {
+  height: 25px;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 90px;
+  color: #ffffff;
+  background: #c4cada;
+  line-height: 24px;
+}
+.signStatus1 {
+  height: 25px;
+  background: #e6ebff;
+  border-radius: 3px;
+  border: 1px solid #5473e8;
+  padding: 0 3px;
+  margin-left: 90px;
+  color: #5473E8;
+  line-height: 24px;
+}
 </style>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -12,24 +12,10 @@
       <!-- 接单开始 -->
       <template slot="right">
         <div>
-          <span style="display: inline-block; width: 300px; color: #8890b1"
+          <span style="display: inline-block; width: 60px; color: #8890b1"
             >接单日期</span
           >
         </div>
-
-        <!-- <ws-date-picker
-          v-model="deptBudgetList.inOutDate"
-          type="date"
-          placeholder="请选择开始日期"
-          value-format="yyyy-MM-dd"
-        />
-        <span>至</span>
-        <ws-date-picker
-          v-model="deptBudgetList.inOutDate"
-          type="date"
-          placeholder="请选择结束日期"
-          value-format="yyyy-MM-dd"
-        /> -->
         <el-date-picker
           v-model="deptBudgetList.inOutDate"
           type="daterange"
@@ -380,30 +366,7 @@ export default {
     find() {
       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>
@@ -507,6 +470,6 @@ export default {
 }
 .el-range-editor--small.el-input__inner {
   height: 32px;
-  margin-left: -20%;
+  margin: 0 10px;
 }
 </style>

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -3,16 +3,14 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button class="but" type="primary" @click="statusquery(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="searchType==1 ?'primary':''" @click="statusquery(1)"> 执行中</ws-button>
+        <ws-button class="but" :type="searchType==2 ?'primary':''" @click="statusquery(2)">已完成</ws-button>
+        <ws-button class="but" :type="searchType== undefined ?'primary':''" @click="statusquery()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="right">
         <div>
-           <span style="display: inline-block; width: 300px;color: #8890B1;">接单日期</span>
+           <span style="display: inline-block; width: 60px;color: #8890B1;">接单日期</span>
         </div>
          <el-date-picker
           v-model="deptBudgetList.inOutDate"
@@ -77,7 +75,7 @@
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
         </el-table-column>
-        <el-table-column prop="status" label="状态">
+        <el-table-column prop="processStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -89,15 +87,15 @@
               <template>
                 <span slot="reference">
                   <span
-                    v-if="scope.row.status == '待执行'"
+                    v-if="scope.row.processStatus == '待执行'"
                     class="executory"
                   ></span>
                   <span
-                    v-if="scope.row.status == '执行中'"
+                    v-if="scope.row.processStatus == '执行中'"
                     class="inExecution"
                   ></span>
-                  <span v-if="scope.row.status == '已完成'" class="done"></span
-                  >{{ scope.row.status }}
+                  <span v-if="scope.row.processStatus == '已完成'" class="done"></span
+                  >{{ scope.row.processStatus }}
                 </span>
               </template>
               <div>
@@ -488,6 +486,6 @@ export default {
 }
 .el-range-editor--small.el-input__inner {
   height: 32px;
-  margin-left: -20%;
+  margin: 0 10px;
 }
 </style>

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -28,7 +28,7 @@
       :rules="rules"
       :model="deptBudgetList"
     >
-      <div class="small-title" style="font-size: 16px;">任务详情</div>
+      <div class="small-title" style="font-size: 16px">任务详情</div>
       <ws-info-table>
         <!--任务编号-->
         <ws-form-item label="任务编号" span="1" prop="processNo">
@@ -88,8 +88,12 @@
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
       </ws-info-table>
-      <div class="small-title" style="font-size: 16px;">联络员及车皮信息</div>
-      <div class="liaison" v-for="(item, index) in deptBudgetList.tranCarInfoList" :key="index">
+      <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
+      <div
+        class="liaison"
+        v-for="(item, index) in deptBudgetList.tranCarInfoList"
+        :key="index"
+      >
         <ws-info-table>
           <!--姓名-->
           <ws-form-item label="姓名：" span="1" prop="driver">
@@ -109,7 +113,7 @@
           </ws-form-item>
           <!--车型-->
           <ws-form-item label="车型：" span="1" prop="carModel">
-            {{item.carModel }}
+            {{ item.carModel }}
           </ws-form-item>
         </ws-info-table>
         <ws-info-table>
@@ -121,7 +125,7 @@
           >
             <!--车厢号-->
             <ws-form-item
-              :label="'车厢号-' + (index + 1)+'：'"
+              :label="'车厢号-' + (index + 1) + '：'"
               span="1"
               prop="trainNo"
             >
@@ -218,7 +222,8 @@ export default {
       arr: [],
     }
   },
-  mounted() {
+
+  activated() {
     this.deptBudgetList.id = this.$route.query.id
     this.getList()
   },
@@ -232,29 +237,29 @@ export default {
     },
   },
   methods: {
-    dataFilter(val) {
-      this.deptBudgetList.personCharge = val
-      if (val) {
-        this.options = this.staffList.filter((item) => {
-          if (
-            !!~item.staffName.indexOf(val) ||
-            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
-          }
-        })
-      } else {
-        this.options = this.staffList
-      }
-    },
-    selectstaff(e) {
-      for (var i = 0; i < this.staffList.length; i++) {
-        if (this.staffList[i].staffName == e) {
-          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
-          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
-        }
-      }
-    },
+    // dataFilter(val) {
+    //   this.deptBudgetList.personCharge = val
+    //   if (val) {
+    //     this.options = this.staffList.filter((item) => {
+    //       if (
+    //         !!~item.staffName.indexOf(val) ||
+    //         !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+    //       ) {
+    //         return true
+    //       }
+    //     })
+    //   } else {
+    //     this.options = this.staffList
+    //   }
+    // },
+    // selectstaff(e) {
+    //   for (var i = 0; i < this.staffList.length; i++) {
+    //     if (this.staffList[i].staffName == e) {
+    //       this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
+    //       this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+    //     }
+    //   }
+    // },
     marker: function (item) {
       this.deptBudgetList.warehousePositioning =
         item.lnglat.lat + ',' + item.lnglat.lng
@@ -271,8 +276,6 @@ export default {
     handleClose() {
       this.dialogViewSpareMoney = false
     },
-    //下拉司机姓名改变事件
-    selectdriver() {},
     handleChange(value) {
       this.selectedOptions = value
     },
@@ -299,13 +302,18 @@ export default {
         .then((response) => {
           this.deptBudgetList = response
           this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          if (response.tranCarInfoList[0].boxNo) {
-            this.list = response.tranCarInfoList[0].boxNo.split(',')
-            for (var i = 0; i < this.list.length; i++) {
-              var num = this.list[i]
-              this.freightspace.push({
-                trainNo: num,
-              })
+          if (this.deptBudgetList.tranCarInfoList.length > 0) {
+            
+            if (response.tranCarInfoList[0].boxNo) {
+              // alert("数组拆分")
+              this.list = response.tranCarInfoList[0].boxNo.split(',')
+              for (var i = 0; i < this.list.length; i++) {
+                var num = this.list[i]
+                this.freightspace.push({
+                  trainNo: num,
+                })
+              }
+              console.log(this.freightspace,"拆分车厢号数组")
             }
           }
         })
@@ -427,6 +435,7 @@ export default {
 /deep/.ws-info-table .el-form-item {
   border-right: 1px solid transparent;
   border-bottom: 1px solid transparent;
+  margin-top: 6px;
 }
 .readonly {
   position: relative;
@@ -546,8 +555,7 @@ export default {
   display: inline-block;
 }
 .center {
-  width: 900px;
-  margin: 0 auto;
+  margin-right: 50px;
 }
 .el-form-item {
   width: 50%;
@@ -693,16 +701,16 @@ export default {
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 30%;
-  background: #F5F7FA;
+  background: #f5f7fa;
   border: none;
 }
 /deep/.liaison .flex {
   display: contents;
 }
-/deep/.liaison{
-  background: #F5F7FA;
-border-radius: 4px;
-border: 0px solid #D8DCE6;
+/deep/.liaison {
+  background: #f5f7fa;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
   // border: 0px solid #d8dce6;
@@ -711,5 +719,4 @@ border: 0px solid #D8DCE6;
   border-bottom: none;
   border-top: none;
 }
-
 </style>

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -92,7 +92,6 @@
       <div
         class="liaison"
         v-for="(item, index) in deptBudgetList.tranCarInfoList"
-        :key="index"
       >
         <ws-info-table>
           <!--姓名-->
@@ -141,34 +140,31 @@
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
-          <!--车型-->
+           <!--车型-->
           <ws-form-item label="车型" span="1" prop="carModel">
-            <ws-select
+            <el-select
               v-model="item.carModel"
-              placeholder="请输入车型"
-              class="typeselect"
-              multiple
+              placeholder="请选择车型"
               filterable
-              allow-create
-              default-first-option
+        
             >
-              <ws-option
+              <el-option
                 v-for="items in carModel"
-                :key="items.constKey"
+                :key="items.value"
                 :label="items.constValue"
                 :value="items.constValue"
               />
-            </ws-select>
+            </el-select>
           </ws-form-item>
         </ws-info-table>
-         <ws-info-table>
+        <ws-info-table>
           <div
             style="width: 100%"
             class="flex position carnum"
             v-for="(item1, index) in freightspace"
             :key="index"
           >
-          <!--车厢号-->
+            <!--车厢号-->
             <ws-form-item
               :label="'车厢号-' + (index + 1)"
               span="1"
@@ -191,7 +187,7 @@
               >
             </ws-form-item>
           </div>
-        </ws-info-table> 
+        </ws-info-table>
       </div>
       <el-button class="add bg-bottom" type="primary" size="small" @click="add">
         <img
@@ -275,11 +271,7 @@ export default {
       size: 10,
       value1: '',
       unitList: [],
-      freightspace: [
-        // {
-        //   trainNo: '',
-        // },
-      ],
+      freightspace: [],
       name: '',
       list: [],
       staffList: [],
@@ -289,7 +281,7 @@ export default {
       arr: [],
     }
   },
-  mounted() {
+  activated() {
     this.deptBudgetList.id = this.$route.query.id
     this.getList()
   },
@@ -361,7 +353,7 @@ export default {
     },
     returnsales() {
       this.deptBudgetList = {}
-      this.freightspace = {}
+      this.freightspace = []
       this.selectedOptions = ''
       this.$router.push({ path: 'tranManagementTransporTationFire' })
     },
@@ -372,7 +364,7 @@ export default {
     uploadSuccess(data, files, url) {
       console.log(data, files, url)
     },
-    submit() {
+    submit(deptBudgetList) {
       for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
         if (!this.deptBudgetList.tranCarInfoList[i].driver) {
           this.$message({
@@ -447,13 +439,16 @@ 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.driver =
+                this.deptBudgetList.tranCarInfoList[0].driver
+              this.tranCarInfoList.driverPhone =
+                this.deptBudgetList.tranCarInfoList[0].driverPhone
               this.tranCarInfoList.sendDateStart =
-                this.deptBudgetList.sendDateStart
+                this.deptBudgetList.tranCarInfoList[0].sendDateStart
               this.tranCarInfoList.receiveDateEnd =
-                this.deptBudgetList.receiveDateEnd
-              this.tranCarInfoList.carModel = this.deptBudgetList.carModel
+                this.deptBudgetList.tranCarInfoList[0].receiveDateEnd
+              this.tranCarInfoList.carModel =
+                this.deptBudgetList.tranCarInfoList[0].carModel.toString()
               this.tranCarInfoList.id =
                 this.deptBudgetList.tranCarInfoList[0].id
               this.tranCarInfoList.tranType = this.tranType
@@ -494,14 +489,33 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
-          if (response.tranCarInfoList[0].boxNo) {
-            this.list = response.tranCarInfoList[0].boxNo.split(',')
-            for (var i = 0; i < this.list.length; i++) {
-              var num = this.list[i]
-              this.freightspace.push({
-                trainNo: num,
-              })
+          if (response.tranCarInfoList.length > 0) {
+            if (response.tranCarInfoList[0].boxNo) {
+              this.list = response.tranCarInfoList[0].boxNo.split(',')
+              for (var i = 0; i < this.list.length; i++) {
+                var num = this.list[i]
+                this.freightspace.push({
+                  trainNo: num,
+                })
+              }
             }
+          } else {
+            this.deptBudgetList.tranCarInfoList = [
+              {
+                driver: '',
+                driverPhone: '',
+                sendDateStart: '',
+                receiveDateEnd: '',
+                carModel: '',
+              },
+            ]
+          }
+          if (!this.deptBudgetList.tranCarInfoList[0].boxNo ) {
+            this.freightspace = [
+              {
+                trainNo: '',
+              },
+            ]
           }
         })
       //司机姓名下拉
@@ -926,13 +940,13 @@ export default {
   line-height: 18px;
 }
 /deep/.carnum {
-     display: contents;
+  display: contents;
 }
 /deep/.carnum .ws-info-table .el-form-item {
   width: 20%;
 }
 /deep/.liaison .carnum .ws-info-table .el-form-item {
   border-radius: 10px;
-right: 20px;
+  right: 20px;
 }
 </style>

src/views/tranManagement/tranManagementVehicle.vue

@@ -7,27 +7,13 @@
           执行中</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>
+        <ws-button class="but" :type="status2==1?'primary':''" @click="changestatus()">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <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="请选择开始日期"
-          value-format="yyyy-MM-dd"
-        />
-        <span>至</span>
-        <ws-date-picker
-          v-model="deptBudgetList.inOutDate"
-          type="date"
-          placeholder="请选择结束日期"
-          value-format="yyyy-MM-dd"
-        /> -->
         <el-date-picker
           v-model="deptBudgetList.inOutDate"
           type="daterange"
@@ -87,7 +73,7 @@
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
         </el-table-column>
-        <el-table-column prop="status" label="状态">
+        <el-table-column prop="processStatus" label="状态">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -99,15 +85,15 @@
               <template>
                 <span slot="reference">
                   <span
-                    v-if="scope.row.status == '待执行'"
+                    v-if="scope.row.processStatus == '待执行'"
                     class="executory"
                   ></span>
                   <span
-                    v-if="scope.row.status == '执行中'"
+                    v-if="scope.row.processStatus == '执行中'"
                     class="inExecution"
                   ></span>
-                  <span v-if="scope.row.status == '已完成'" class="done"></span
-                  >{{ scope.row.status }}
+                  <span v-if="scope.row.processStatus == '已完成'" class="done"></span
+                  >{{ scope.row.processStatus }}
                 </span>
               </template>
               <div>
@@ -333,6 +319,11 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
+    changestatus(state){
+      this.searchType = state
+      this.getList()
+
+    },
     getList() {
       automobileList({
         compId: sessionStorage.getItem('ws-pf_compId'),
@@ -377,13 +368,13 @@ export default {
           return false
         })
     },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
-      }
-    },
+    // selecttaskType(e) {
+    //   for (var i = 0; i < this.taskTypeList.length; i++) {
+    //     if (this.taskTypeList[i].value == e) {
+    //       this.searchType = this.taskTypeList[i].type
+    //     }
+    //   }
+    // },
     fujian(row) {
       if (
         row.receiveAttachmentPath === null ||
@@ -419,29 +410,29 @@ 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',
-      })
-    },
+    // 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>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -251,23 +251,21 @@
             合计{{ 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
-          >
+            <img
+              width="22"
+              height="22"
+              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
+              >提交</el-button
             >
           </div>
         </div>
@@ -352,11 +350,15 @@ export default {
   },
   computed: {
     total: function () {
-      var maxStorage = 0
-      for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-        maxStorage += Number(this.deptBudgetList.tranCarInfoList[i].loadWeight)
+      if (this.deptBudgetList.tranCarInfoList.length > 0) {
+        var maxStorage = 0
+        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+          maxStorage += Number(
+            this.deptBudgetList.tranCarInfoList[i].loadWeight
+          )
+        }
+        return maxStorage
       }
-      return maxStorage
     },
   },
   methods: {
@@ -527,7 +529,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 /deep/.basicInformation {
-  height:87vh;
+  height: 87vh;
   overflow: scroll;
   .ws-info-table {
     border: none;
@@ -639,8 +641,8 @@ export default {
   font-size: 14px;
 }
 /deep/.ws-info-table .el-form-item {
- border: none;
- height: 50px;
+  border: none;
+  height: 50px;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
   width: 40%;
@@ -671,11 +673,11 @@ export default {
   border-bottom: none;
   border-top: none;
 }
-/deep/.liaison .ws-info-table{
-  background: #F6F7FC;
-border-radius: 4px;
-border: 1px solid #D8DCE6;
-margin-top: 20px;
+/deep/.liaison .ws-info-table {
+  background: #f6f7fc;
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-top: 20px;
 }
 //送达/未送达
 .noservice,