zhongtianhaoyuan 3 lat temu
rodzic
commit
638a400201

+ 0 - 3
src/views/taskManagement/tranManagementTransportAdd.vue

@@ -570,7 +570,6 @@ export default {
       this.dialogViewSpareMoney = false
     },
     add(index) {
-      console.log(index)
       this.deptBudgetList.tranProcessInfoList.push({
         processNo: this.deptBudgetList.taskNo+'-'+(index+2),
         tranType: '汽运',
@@ -687,7 +686,6 @@ export default {
     onChange(files) {
       this.fileNum = files
       this.$refs.upload.handleSaveBill().then(res => {
-        console.log(files)
       })
     },
 
@@ -791,7 +789,6 @@ export default {
             this.deptBudgetList.tranProcessInfoList[i].sort = i
 
           }
-          console.log(this.deptBudgetList.tranProcessInfoList,"数组111")
           addtrantask(this.deptBudgetList)
             .toPromise()
             .then(response => {

+ 14 - 43
src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -99,22 +99,22 @@
           <ws-form-item label="姓名:" span="1" prop="driver">
             {{ item.driver }}
           </ws-form-item>
-         
+
           <!--电话-->
           <ws-form-item label="电话:" span="1" prop="driverPhone">
             {{ item.driverPhone }}
           </ws-form-item>
-        
+
           <!--发车日期-->
           <ws-form-item label="发车日期:" span="1" prop="sendDateStart">
             {{ item.sendDateStart }}
           </ws-form-item>
-          
+
           <!--到站日期-->
           <ws-form-item label="到站日期:" span="1" prop="receiveDateEnd">
             {{ item.receiveDateEnd }}
           </ws-form-item>
-          
+
           <!--车型-->
           <ws-form-item label="车型:" span="1" prop="carModel">
             {{ item.carModel }}
@@ -174,24 +174,15 @@ export default {
   },
   data() {
     return {
-      staffList: [],
       deptBudgetList: {
         totalStorage: 0,
         tranCarInfoList: [],
       },
       options_: regionData,
-      heightData: '600px',
-      zoom: 7,
       selectedOptions: [],
       center: [116.244694, 39.517344],
-      window: '',
-      radio: 1,
-      personCharge: [],
-      district: null,
-      driverList: [],
       listDate: { country: '中国', level: 'country', city: '' },
       citylist: [],
-      compId: sessionStorage.getItem('ws-pf_compId'),
       tranType: 2,
       rules: {
         warehouseName: [
@@ -208,15 +199,9 @@ export default {
           },
         ],
       },
-      appendixIdsAdd: '',
       size: 10,
-      value1: '',
       unitList: [],
-      freightspace: [
-        // {
-        //   trainNo: '',
-        // },
-      ],
+      freightspace: [],
       name: '',
       list: [],
       staffList: [],
@@ -226,7 +211,6 @@ export default {
       arr: [],
     }
   },
-
   activated() {
     this.deptBudgetList.id = this.$route.query.id
     this.getList()
@@ -241,22 +225,14 @@ export default {
     },
   },
   methods: {
-    marker: function (item) {
-      this.deptBudgetList.warehousePositioning =
-        item.lnglat.lat + ',' + item.lnglat.lng
-    },
-    selectedAddress(e) {
-      this.deptBudgetList.warehousePositioning =
-        e.center.lat + ',' + e.center.lng
-    },
     confirmPositioncity() {
       this.listDate.level = 'city'
       this.listDate.country = this.name
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
-    handleClose() {
-      this.dialogViewSpareMoney = false
-    },
+    // handleClose() {
+    //   this.dialogViewSpareMoney = false
+    // },
     handleChange(value) {
       this.selectedOptions = value
     },
@@ -283,24 +259,19 @@ export default {
         .then((response) => {
           this.deptBudgetList = response
           this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          if (this.deptBudgetList.tranCarInfoList.length > 0) {      
+          if (this.deptBudgetList.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,
+                  trainNo: num,
                 })
               }
             }
           }
         })
     },
-    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) {
@@ -657,7 +628,7 @@ export default {
   color: #8890b1;
   padding: 0 25px;
   border-left: 1px solid transparent;
-  background: #F5F7FA;
+  background: #f5f7fa;
 }
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
@@ -681,8 +652,8 @@ export default {
   border: 1px solid #d8dce6;
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
-border-right: 1px solid #D8DCE6;
-padding: 0px;
-border-radius: 0px;
+  border-right: 1px solid #d8dce6;
+  padding: 0px;
+  border-radius: 0px;
 }
 </style>

+ 22 - 63
src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -21,7 +21,6 @@
         >
       </el-col>
     </el-row>
-
     <ws-form
       class="position"
       ref="deptBudgetList"
@@ -90,7 +89,7 @@
       <div
         class="liaison"
         v-for="(item, index) in deptBudgetList.tranCarInfoList"
-        :key='index'
+        :key="index"
       >
         <ws-info-table>
           <!--姓名-->
@@ -139,13 +138,12 @@
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
-           <!--车型-->
+          <!--车型-->
           <ws-form-item label="车型" span="1" prop="carModel">
             <el-select
               v-model="item.carModel"
               placeholder="请选择车型"
               filterable
-        
             >
               <el-option
                 v-for="items in carModel"
@@ -189,17 +187,10 @@
         </ws-info-table>
       </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=""
-        />
+        <img width="22" height="22" src="../../../public/img/add.png" alt="" />
         <div class="spans">添加车厢</div>
       </el-button>
     </ws-form>
-
     <!-- 提交 -->
     <div style="text-align: right; padding: 10px" class="center">
       <el-button
@@ -238,18 +229,12 @@ export default {
         totalStorage: 0,
       },
       options_: regionData,
-      heightData: '600px',
-      zoom: 7,
       selectedOptions: [],
       center: [116.244694, 39.517344],
-      window: '',
-      radio: 1,
       personCharge: [],
-      district: null,
       driverList: [],
       listDate: { country: '中国', level: 'country', city: '' },
       citylist: [],
-      compId: sessionStorage.getItem('ws-pf_compId'),
       tranType: 2,
       rules: {
         warehouseName: [
@@ -266,9 +251,7 @@ export default {
           },
         ],
       },
-      appendixIdsAdd: '',
       size: 10,
-      value1: '',
       unitList: [],
       freightspace: [],
       name: '',
@@ -319,10 +302,6 @@ export default {
         }
       }
     },
-    marker: function (item) {
-      this.deptBudgetList.warehousePositioning =
-        item.lnglat.lat + ',' + item.lnglat.lng
-    },
     selectedAddress(e) {
       this.deptBudgetList.warehousePositioning =
         e.center.lat + ',' + e.center.lng
@@ -332,9 +311,9 @@ export default {
       this.listDate.country = this.name
     },
     // 关闭 dialog时 处理文件url 初始化upload组件
-    handleClose() {
-      this.dialogViewSpareMoney = false
-    },
+    // handleClose() {
+    //   this.dialogViewSpareMoney = false
+    // },
     add() {
       this.freightspace.push({
         trainNo: '',
@@ -346,7 +325,6 @@ export default {
       }
     },
     //下拉司机姓名改变事件
-    selectdriver() {},
     handleChange(value) {
       this.selectedOptions = value
     },
@@ -356,9 +334,6 @@ export default {
       this.selectedOptions = ''
       this.$router.go(-1)
     },
-    // confirmPosition() {
-    //   this.draggable = false
-    // },
     // 上传附件
     uploadSuccess(data, files, url) {
       console.log(data, files, url)
@@ -477,10 +452,6 @@ export default {
           return false
         })
     },
-    resetForm(deptBudgetList) {
-      this.$refs[deptBudgetList].resetFields()
-    },
-
     getList() {
       seeCat({ id: this.deptBudgetList.id })
         .toPromise()
@@ -507,7 +478,7 @@ export default {
               },
             ]
           }
-          if (!this.deptBudgetList.tranCarInfoList[0].boxNo ) {
+          if (!this.deptBudgetList.tranCarInfoList[0].boxNo) {
             this.freightspace = [
               {
                 trainNo: '',
@@ -530,11 +501,6 @@ export default {
           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) {
@@ -653,11 +619,6 @@ export default {
 .el-col {
   background: #f6f7fc;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  padding: 0 25px;
-  border-left: 1px solid transparent;
-  background: #fff;
-}
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 100px;
   text-align: center;
@@ -837,18 +798,7 @@ export default {
   border: none;
   height: 50px;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  font-family: PingFangSC-Regular, PingFang SC;
-  margin-bottom: 5px;
-  background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
+
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   background-color: #fff;
   font-size: 14px;
@@ -856,11 +806,7 @@ export default {
   color: #8890b1;
   line-height: 16px;
 }
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-}
+
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
 }
@@ -884,6 +830,7 @@ export default {
 }
 /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
   border: none;
+  border-radius: 0px;
 }
 .add {
   width: 100px;
@@ -915,4 +862,16 @@ export default {
   border-radius: 10px;
   right: 20px;
 }
+/deep/.ws-info-table .el-form-item .el-form-item__content {
+  border-radius: 4px;
+  border: 1px solid #d8dce6;
+  margin-bottom: 5px;
+  background-color: #fff;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
+  padding: 0 25px;
+  background: #f6f7fc;
+}
 </style>

+ 48 - 52
src/views/tranManagement/tranManagementVehicle.vue

@@ -235,9 +235,6 @@ export default {
     }
   },
   activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
     this.getList()
     this.showType = this.isShow
   },
@@ -251,37 +248,37 @@ export default {
         },
       })
     },
-    getSpanArr(data) {
-      let that = this
+    // getSpanArr(data) {
+    //   let that = this
 
-      //页面展示的数据,不一定是全部的数据,所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+    //   //页面展示的数据,不一定是全部的数据,所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
 
-      that.spanArr = []
+    //   that.spanArr = []
 
-      that.pos = 0
+    //   that.pos = 0
 
-      //遍历数据
+    //   //遍历数据
 
-      data.forEach((item, index) => {
-        //判断是否是第一项
+    //   data.forEach((item, index) => {
+    //     //判断是否是第一项
 
-        // if (index === 0) {
-        //   this.spanArr.push(1)
-        //   this.pos = 0
-        // } else {
-        //不是第一项时,就根据标识去存储
-        if (data[index].warehouseNumViewList.length > 1) {
-          // 查找到符合条件的数据时每次要把之前存储的数据+1
-          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-          this.spanArr.push(0)
-        } else {
-          // 没有符合的数据时,要记住当前的index
-          this.spanArr.push(1)
-          this.pos = index
-        }
-        // }
-      })
-    },
+    //     // if (index === 0) {
+    //     //   this.spanArr.push(1)
+    //     //   this.pos = 0
+    //     // } else {
+    //     //不是第一项时,就根据标识去存储
+    //     if (data[index].warehouseNumViewList.length > 1) {
+    //       // 查找到符合条件的数据时每次要把之前存储的数据+1
+    //       this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+    //       this.spanArr.push(0)
+    //     } else {
+    //       // 没有符合的数据时,要记住当前的index
+    //       this.spanArr.push(1)
+    //       this.pos = index
+    //     }
+    //     // }
+    //   })
+    // },
     //查看//传参
     nocomplete(row) {
       this.$router.push({
@@ -329,7 +326,6 @@ export default {
     changestatus(state){
       this.searchType = state
       this.getList()
-
     },
     getList() {
       automobileList({
@@ -388,30 +384,30 @@ 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
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
+    // fujian(row) {
+    //   if (
+    //     row.receiveAttachmentPath === null ||
+    //     row.receiveAttachmentPath === ''
+    //   ) {
+    //     EventBus.$emit(
+    //       'warning',
+    //       this.$t('system.noticeCircular.NoInformation')
+    //     )
+    //   } else {
+    //     this.accessoryTFs = true
+    //   }
+    //   this.appendixIdss = row.receiveAttachmentPath
+    // },
+    // handleExamine(row) {
+    //   this.$router.push({
+    //     name: 'salesContractExamine',
+    //     query: { id: row.id },
+    //   })
+    // },
     // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
+    // handleCloe() {
+    //   this.dialogViewSpareMoney = false
+    // },
     history(row) {
       billoperatehis({ id: row.id })
         .toPromise()

+ 0 - 16
src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -312,9 +312,6 @@ export default {
       carList: [],
       // 提交类型
       readonly: true,
-      appendixIdsAdd: '',
-      onChange: {},
-      gradeList: [],
       rules: {
         netWeight: [
           {
@@ -327,17 +324,13 @@ export default {
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
         month: dayjs().format('MM'),
       },
-      contractList: [],
       deptBudgetList: {
         tranCarInfoList: [],
       },
-      historyList: [],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
           return time.getTime() > Date.now()
@@ -534,15 +527,6 @@ export default {
         }
       }
     },
-    // selecttaskType(e) {
-    //   for (var i = 0; i < this.taskTypeList.length; i++) {
-    //     if (this.taskTypeList[i].value == e) {
-    //       this.searchType = this.taskTypeList[i].type
-    //     }
-    //   }
-    // },
-    // approve() {},
-    // listQuery() {},
   },
 }
 </script>

+ 25 - 62
src/views/tranManagement/tranManagementVehicleLook.vue

@@ -22,7 +22,6 @@
         </el-button>
       </el-col>
     </el-row>
-
     <ws-form ref="deptBudgetList" :rules="rules" :model="deptBudgetList">
       <div class="small-title" style="font-size: 16px">任务详情</div>
       <ws-info-table>
@@ -105,7 +104,6 @@
           <ws-form-item label="姓名:" span="1" prop="driver">{{
             item.driver
           }}</ws-form-item>
-          <!-- <el-divider direction="vertical" class="line"></el-divider> -->
           <ws-form-item
             class="phone"
             label="电话:"
@@ -113,51 +111,44 @@
             prop="driverPhone"
             >{{ item.driverPhone }}</ws-form-item
           >
-          <!-- <el-divider direction="vertical" class="line"></el-divider> -->
           <ws-form-item label="车牌号:" span="1" prop="carNo">
             <template slot-scope="scope">
-            <el-popover
-              placement="top"
-              :width="160"
-              trigger="hover"
-              visible-arrow="false"
-              @show="hover(scope.row)"
-            >
-              <template>
-                <span slot="reference">
-                  <span
-                    class="executory"
-                  >
-                  {{ item.carNo }}
+              <el-popover
+                placement="top"
+                :width="160"
+                trigger="hover"
+                visible-arrow="false"
+                @show="hover(scope.row)"
+              >
+                <template>
+                  <span slot="reference">
+                    <span class="executory">
+                      {{ item.carNo }}
+                    </span>
                   </span>
-                </span>
-              </template>
-              <div>
+                </template>
+                <div>
                   <span>车型:</span>
-                  <span>{{item.carModel }}</span>
-                  <br>
+                  <span>{{ item.carModel }}</span>
+                  <br />
                   <span>车长(米):</span>
-                  <span>{{item.carLength}}</span>
-                  <br>
-                   <span>载重(吨):</span>
-                  <span>{{item.loadWeight}}</span>
-              </div>
-            </el-popover>
-          </template>
+                  <span>{{ item.carLength }}</span>
+                  <br />
+                  <span>载重(吨):</span>
+                  <span>{{ item.loadWeight }}</span>
+                </div>
+              </el-popover>
+            </template>
           </ws-form-item>
-          <!-- <el-divider direction="vertical" class="line"></el-divider> -->
           <ws-form-item label="装车(吨):" span="1" prop="loadNetWeight">{{
             item.loadNetWeight
           }}</ws-form-item>
-          <!-- <el-divider direction="vertical" class="line"></el-divider> -->
           <ws-form-item label="卸车(吨):" span="1" prop="unloadNetWeight">{{
             item.unloadNetWeight
           }}</ws-form-item>
-          <!-- <el-divider direction="vertical" class="line"></el-divider> -->
           <ws-form-item label="损耗(吨):" span="1" prop="loss">{{
             item.loss
           }}</ws-form-item>
-          <!-- <el-divider direction="vertical" class="line"></el-divider> -->
           <ws-form-item
             label="合同:"
             span="1"
@@ -182,7 +173,6 @@
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import { seeCat } from '@/model/transport/index'
-// import { dayjs, fmoney, EventBus } from 'base-core-lib'
 import { dayjs } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
@@ -191,34 +181,22 @@ export default {
     Pagination,
   },
   watch: {
-    // vesselId(val) {
-    //   this.getList()
-    // },
     isShow(val) {
       this.showType = val
     },
   },
   data() {
     return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
       // 是否显示
       showType: true,
       // 年
       year: '',
-      deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
       searchType: 1,
       startDate: null,
       endDate: null,
-      // 提交类型
-      submitType: true,
+
       readonly: true,
       rules: {
         netWeight: [
@@ -231,7 +209,6 @@ export default {
         ],
       },
       size: 10,
-      compId: sessionStorage.getItem('ws-pf_compId'),
       date: {
         year: dayjs().format('YYYY'),
         month: dayjs().format('MM'),
@@ -282,15 +259,6 @@ export default {
           this.deptBudgetList = response
         })
     },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
-    //删除
-    approve() {},
-    listQuery() {},
   },
 }
 </script>
@@ -459,7 +427,7 @@ export default {
   margin-left: 15px;
 }
 /deep/.driver .ws-info-table .el-form-item .el-form-item__content {
-   border-right: 1px solid #D8DCE6;
+  border-right: 1px solid #d8dce6;
   background: #f6f7fb;
   font-size: 14px;
   color: #8890b1;
@@ -487,9 +455,4 @@ export default {
 /deep/.driver.ws-info-table .el-form-item .el-form-item__content {
   border: none;
 }
-.line {
-  height: 26px;
-  margin-top: 6px;
-  left: -14px;
-}
 </style>