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

src/views/contractManagement/purchaseContractAdd.vue

@@ -48,15 +48,15 @@
           <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small" />
         </ws-form-item>
         <!--关联合同-->
-        <ws-form-item prop="contractNo" label="关联合同" span="1" v-show="deptBudgetList.agreementType =='补充协议'">
-          <ws-select v-model="deptBudgetList.contractNo" placeholder="请选择编号" @change="selectRelation">
-            <ws-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+        <ws-form-item prop="agreementNo" label="关联合同" span="1" v-show="deptBudgetList.agreementType =='补充协议'">
+          <ws-select v-model="deptBudgetList.agreementNo" placeholder="请选择编号" @change="selectRelation">
+            <ws-option v-for="item in contractNoList" :key="item.constKey" :label="item.agreementNo"
               :value="item.contractNo"></ws-option>
           </ws-select>
         </ws-form-item>
         <!--补充协议编号-->
-        <ws-form-item v-show="deptBudgetList.agreementType == '补充协议'" label="补充协议编号" span="1" prop="agreementNo">
-          <ws-input v-model="deptBudgetList.agreementNo" placeholder="请输入补充协议编号" maxlength="100" size="small" />
+        <ws-form-item v-show="deptBudgetList.agreementType == '补充协议'" label="补充协议编号" span="1" prop="contractNo">
+          <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入补充协议编号" maxlength="100" size="small" />
         </ws-form-item>
         <!--运输方式-->
         <ws-form-item label="运输方式" span="1" prop="shippingType">
@@ -677,6 +677,7 @@
           if (this.contractNoList[i].contractNo == e) {
             this.deptBudgetList = this.contractNoList[i]
             this.deptBudgetList.agreementNo = this.contractNoList[i].contractNo
+            this.deptBudgetList.contractNo = this.contractNoList[i].contractNo
             this.deptBudgetList.agreementType = '补充协议'
           }
         }

src/views/contractManagement/purchaseContractEdit.vue

@@ -42,12 +42,12 @@
         <ws-form-item label="合同编号" v-if="deptBudgetList.agreementType=='采购合同'" span="1" prop="contractNo">
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
-        <ws-form-item label="关联合同" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
-        </ws-form-item>
-        <ws-form-item label="补充协议编号" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="agreementNo">
+        <ws-form-item label="关联合同" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="agreementNo">
           {{ deptBudgetList.agreementNo }}
         </ws-form-item>
+        <ws-form-item label="补充协议编号" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
         <!-- 运输方式 -->
         <ws-form-item label="运输方式" span="1" prop="shippingType">
           <ws-input

src/views/contractManagement/purchaseContractExamine.vue

@@ -72,12 +72,12 @@
         <ws-form-item label="合同编号" v-if="deptBudgetList.agreementType=='采购合同'" span="1" prop="contractNo">
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
-        <ws-form-item label="关联合同" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
-        </ws-form-item>
-        <ws-form-item label="补充协议编号" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="agreementNo">
+        <ws-form-item label="关联合同" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="agreementNo">
           {{ deptBudgetList.agreementNo }}
         </ws-form-item>
+        <ws-form-item label="补充协议编号" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="contractNo">
+          {{ deptBudgetList.contractNo }}
+        </ws-form-item>
         <ws-form-item label="运输方式" span="1" prop="shippingType">
           {{ deptBudgetList.shippingType }}
         </ws-form-item>

src/views/contractManagement/salesContractAdd.vue

@@ -34,16 +34,16 @@
               :rules="ruleDeptBudget" />
           </ws-form-item>
           <!--关联合同-->
-          <ws-form-item prop="contractNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'">
-            <ws-select v-model="deptBudgetList.contractNo" placeholder="请选择编号" @change="selectRelation">
-              <ws-option v-for="item in contractNoList" :key="item.constKey" :label="item.contractNo"
+          <ws-form-item prop="agreementNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'">
+            <ws-select v-model="deptBudgetList.agreementNo" placeholder="请选择编号" @change="selectRelation">
+              <ws-option v-for="item in contractNoList" :key="item.constKey" :label="item.agreementNo"
                 :value="item.contractNo"></ws-option>
             </ws-select>
           </ws-form-item>
           <!--补充协议编号-->
-          <ws-form-item label="补充协议编号" span="1" prop="agreementNo" class="readonly"
+          <ws-form-item label="补充协议编号" span="1" prop="contractNo" class="readonly"
             v-if="deptBudgetList.agreementType == '补充协议'">
-            <ws-input v-model="deptBudgetList.agreementNo" placeholder="请输入补充协议编号" maxlength="50" size="small"
+            <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入补充协议编号" maxlength="50" size="small"
               :rules="ruleDeptBudget" />
           </ws-form-item>
           <!--运输方式-->
@@ -612,6 +612,7 @@
           if (this.contractNoList[i].contractNo == e) {
             this.deptBudgetList = this.contractNoList[i]
             this.deptBudgetList.agreementNo = this.contractNoList[i].contractNo
+            this.deptBudgetList.contractNo = this.contractNoList[i].contractNo
             this.deptBudgetList.agreementType = '补充协议'
           }
         }

src/views/contractManagement/salesContractEdit.vue

@@ -23,14 +23,14 @@
         <!--基本信息-->
         <ws-info-table>
           <!--合同类型-->
-          <ws-form-item label="合同类型" span="1" class="readonly">
+          <ws-form-item label="合同类型" span="1">
             <div class="unchanged">
-              {{ deptBudgetList.agreementType1 }}
+              {{ deptBudgetList.agreementType}}
             </div>
             <span class="unchangeable">*</span>
           </ws-form-item>
           <!--合同编号-->
-          <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly"
+          <ws-form-item label="合同编号" span="1" prop="contractNo"
             v-if="deptBudgetList.agreementType == '销售合同'">
             <div class="unchanged">
               {{ deptBudgetList.contractNo }}
@@ -38,14 +38,19 @@
             <span class="unchangeable">*</span>
           </ws-form-item>
           <!--关联合同-->
-          <ws-form-item prop="contractNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'"
-            class="readonly">
-            {{ deptBudgetList.contractNo }}
+          <ws-form-item prop="agreementNo" label="关联合同" span="1" v-if="deptBudgetList.agreementType == '补充协议'">
+             <div class="unchanged">
+            {{ deptBudgetList.agreementNo }}
+            </div>
+            <span class="unchangeable">*</span>
           </ws-form-item>
           <!--补充协议编号-->
-          <ws-form-item label="补充协议编号" span="1" prop="agreementNo" class="readonly"
+          <ws-form-item label="补充协议编号" span="1" prop="contractNo"
             v-if="deptBudgetList.agreementType == '补充协议'">
-            {{ deptBudgetList.agreementNo }}
+              <div class="unchanged">
+            {{ deptBudgetList.contractNo }}
+            </div>
+            <span class="unchangeable">*</span>
           </ws-form-item>
           <!--运输方式-->
           <ws-form-item label="运输方式" span="1" prop="contractNo">

src/views/contractManagement/salesContractExamine.vue

@@ -70,11 +70,26 @@
           <h3>基本信息</h3>
         </div>
         <ws-info-table>
-          <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <div class="unchanged">
-              {{ deptBudgetList.contractNo }}
-            </div>
-          </ws-form-item>
+        <ws-form-item label="合同类型" span="1" prop="agreementType">
+           <div class="unchanged">
+          {{ deptBudgetList.agreementType }}
+           </div>
+        </ws-form-item>
+        <ws-form-item label="合同编号" v-if="deptBudgetList.agreementType=='销售合同'" span="1" prop="contractNo">
+           <div class="unchanged">
+          {{ deptBudgetList.contractNo }}
+           </div>
+        </ws-form-item>
+        <ws-form-item label="关联合同" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="agreementNo">
+           <div class="unchanged">
+          {{ deptBudgetList.agreementNo }}
+           </div>
+        </ws-form-item>
+        <ws-form-item label="补充协议编号" v-if="deptBudgetList.agreementType=='补充协议'" span="1" prop="contractNo">
+           <div class="unchanged">
+          {{ deptBudgetList.contractNo }}
+           </div>
+        </ws-form-item>
           <ws-form-item label="运输方式" span="1" prop="shippingType">
             <div class="unchanged">
               {{ deptBudgetList.shippingType }}

src/views/statisticalReport/huoyunList.vue

@@ -4,17 +4,17 @@
     <el-scrollbar style="height: 100%">
       <el-row>
         <el-col style="padding-left: 15px" :span="16">
-          <!-- <ws-button
+          <ws-button
             :type="searchType == 1 ? 'primary' : ''"
             @click="handlestatus(1)"
             >待审核</ws-button
-          > -->
+          >
           <ws-button
             :type="searchType == 2 ? 'primary' : ''"
             @click="handlestatus(2)"
             >待结算</ws-button
           >
-          <!-- <ws-button
+          <ws-button
             :type="searchType == 3 ? 'primary' : ''"
             @click="handlestatus(3)"
             >已结算</ws-button
@@ -35,7 +35,7 @@
             v-hasPermission="`report.transportationReport.view`"
             @click="handlereject()"
             >驳回</ws-button
-          > -->
+          >
           <ws-button
             type="primary"
             v-hasPermission="`report.transportationReport.payment`"
@@ -84,7 +84,7 @@
 
       <el-table
         class="wenzi"
-        :data="warehouseList"
+        :data="warehouseList.records"
         style="width: 100%; margin-top: 20px"
         ref="warehouseList"
         border
@@ -114,14 +114,14 @@
           prop="processNo"
           label="运输阶段"
         ></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           class="table_td"
           prop="n"
           label="类型"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           class="boxNo"
-          prop="phone"
+          prop="boxNo"
           label="箱号/仓位号"
         ></el-table-column>
         <el-table-column
@@ -137,22 +137,6 @@
         </el-table-column>
         <el-table-column class="table_td" prop="lossWeight" label="损耗(吨)">
         </el-table-column>
-        <el-table-column class="table_td" label="账户" prop="">
-          <template slot-scope="scope">
-            <div
-              style="
-                display: inline-block;
-                color: #5878e8;
-                padding: 0 4px !important;
-                position: relative;
-                font-size: 14px;
-              "
-              @click="look(scope.row)"
-            >
-              查看
-            </div>
-          </template></el-table-column
-        >
       </el-table>
 
       <!-- 页数 -->
@@ -447,11 +431,7 @@ export default {
       compId: sessionStorage.getItem('ws-pf_compId'),
       roleId: sessionStorage.getItem('ws-pf_roleId'),
       deptCircularPage: {},
-      warehouseList: [
-        {
-          contractNo:"kmrlejrpoj",
-        }
-      ],
+      warehouseList: [],
       orderList: {},
       deptBudgetList: {},
       id: '',

src/views/statisticalReport/shippingList.vue

@@ -142,6 +142,7 @@
           label="损耗(吨)"
         >
         </el-table-column>
+    
       </el-table>
 
       <!-- 页数 -->
@@ -1022,7 +1023,7 @@ export default {
     getList() {
       autoList({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        tranTypeKey: 2,
+        tranTypeKey: 3,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -125,15 +125,7 @@
               >提交</el-button
             >
            </div>
-             
-           
           </div>
-
-
-
-
-
-
           <div
             class="position siji"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
@@ -693,6 +685,13 @@ export default {
       }
     },
     add() {
+        if(!this.deptBudgetList.tranPrice){
+        this.$message({
+          message: '请设置运输总价！',
+          type: 'warning',
+        })
+      }
+      else{
       this.deptBudgetList.tranCarInfoList.push({
         driver: this.deptBudgetList.tranCarInfoList[0].driver,
         driverPhone: this.deptBudgetList.tranCarInfoList[0].driverPhone,
@@ -705,6 +704,7 @@ export default {
         positionWeight: '',
         tranType: '3',
       })
+      }
     },
     selectdriver() {},
     handleChange(value) {
@@ -716,7 +716,7 @@ export default {
       this.selectedOptions = ''
       this.$router.push({ path: 'tranManagementShipping' })
     },
-        //审核
+      //审核
     examine(){
       this.$prompt('运输单价审核', {
           cancelButtonText: '取消',
@@ -728,7 +728,7 @@ export default {
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.flag = "2"
               tranProcessInfo.tranPriceIng = value
-              tranProcessInfo.tranTypeKey = 2
+                 tranProcessInfo.tranTypeKey = 3
               setUpTranPrice(tranProcessInfo)
                 .toPromise()
                 .then((response) => {
@@ -752,7 +752,7 @@ export default {
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.flag = "1"
               tranProcessInfo.tranPriceIng = this.deptBudgetList.tranPriceIng
-                tranCarInfo.tranTypeKey = 3
+               tranProcessInfo.tranTypeKey = 3
               setUpTranPrice(tranProcessInfo)
                 .toPromise()
                 .then((response) => {

src/views/tranManagement/tranManagementShippingLook.vue

@@ -62,6 +62,18 @@
 
           <div>
             <div class="small-title" style="font-size: 16px">联络员及航次</div>
+            <div class="myTest">
+            <!--当前运输总价-->
+          <ws-form-item label="当前运输总价(元/吨):" span="1" prop="tranPrice">
+              <ws-input
+                v-model="deptBudgetList.tranPrice"
+                maxlength="70"
+                :disabled="readonly"
+                size="small"
+                style="width:70px"
+              />
+          </ws-form-item>
+       </div>
             <div v-if='deptBudgetList.tranCarInfoList'>
               <div style="width: 100% " class="flex position middle"
                 v-for="(item, index) in deptBudgetList.tranCarInfoList" :key="index">
@@ -461,4 +473,9 @@
     border: none;
 
   }
+  .myTest{
+    width: 800px;
+    display: flex;
+    height: 40px;
+  }
 </style>

src/views/tranManagement/tranManagementTransporTrainDetails.vue

@@ -89,6 +89,18 @@
         </ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
+      <div class="myTest">
+            <!--当前运输总价-->
+          <ws-form-item label="当前运输总价(元/吨):" span="1" prop="tranPrice">
+              <ws-input
+                v-model="deptBudgetList.tranPrice"
+                maxlength="70"
+                :disabled="readonly"
+                size="small"
+                style="width:70px"
+              />
+          </ws-form-item>
+       </div>
       <div
         class="liaison"
         v-for="(item, index) in deptBudgetList.tranCarInfoList"
@@ -631,4 +643,9 @@ export default {
   padding: 0px;
   border-radius: 0px;
 }
+  .myTest{
+    width: 800px;
+    display: flex;
+    height: 40px;
+  }
 </style>

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -357,6 +357,13 @@ export default {
     //   this.dialogViewSpareMoney = false
     // },
     add() {
+        if(!this.deptBudgetList.tranPrice){
+        this.$message({
+          message: '请设置运输总价！',
+          type: 'warning',
+        })
+      }
+      else{
       this.deptBudgetList.tranCarInfoList.push({
         driver: this.deptBudgetList.tranCarInfoList[0].driver,
         driverPhone: this.deptBudgetList.tranCarInfoList[0].driverPhone,
@@ -366,6 +373,7 @@ export default {
         boxNo: '',
         tranType: '2',
       })
+      }
     },
     del(index, row) {
       if (row.status == '未装车') {

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -128,11 +128,12 @@
                   style="width:70px"
                 />
             </ws-form-item>
+             
             <ws-form-item>
              <el-button
               v-if="deptBudgetList.priceStatus=='审核中'"
               type="primary"
-              v-hasPermission="`transportationTask.transportation.transportationInfo.exe`"
+            v-hasPermission="`transportationTask.transportation.transportationInfo.exe`"
               size="small"
               @click="examine()"
               >审核中</el-button
@@ -596,7 +597,7 @@ export default {
         }).then(({ value }) => {
               var tranProcessInfo = {}
               tranProcessInfo.reviewer = sessionStorage.getItem('ws-pf_roleName') +
-        sessionStorage.getItem('ws-pf_staffName')
+               sessionStorage.getItem('ws-pf_staffName')
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.flag = "2"
               tranProcessInfo.tranPriceIng = value