前端 sdy

src/views/houseSelfCollect/paymentManagement.vue

@@ -111,7 +111,7 @@
       </el-table-column>
       <el-table-column class="table_td" prop="status" width="100" label="是否开票">
         <template scope="scope">
-          <span v-if="scope.row.approveStatus">未开票</span>
+          <span v-if="scope.row.invoicing == '0'">未开票</span>
           <span v-else>已开票</span>
         </template>
       </el-table-column>
@@ -361,9 +361,12 @@ import download from '../../components/WsDownload/download'
           year: dayjs().format('YYYY'),
           month: dayjs().format('MM'),
         },
+        
       }
     },
     activated() {
+     
+     
       this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
       this.getPassYearFormatDate()
       this.getWarehouse()
@@ -722,7 +725,11 @@ import download from '../../components/WsDownload/download'
           .toPromise()
           .then(response => {
             this.warehouseList = response
-            if (_wareHouse) {
+            if(this.$route.query.warehouseName){//判断是否在任务页面进来
+                this.warehouseName =  this.$route.query.warehouseName
+               this.warehouseNameKey = this.$route.query.warehouseName
+            }else{
+               if (_wareHouse) {
               this.warehouseNameKey = _wareHouse.id
               this.warehouseName = _wareHouse.value
             } else {
@@ -734,6 +741,7 @@ import download from '../../components/WsDownload/download'
                 this.warehouseName = this.warehouseList[0].warehouseName
               }
             }
+            }
             this.getList()
           })
       },
@@ -856,8 +864,6 @@ import download from '../../components/WsDownload/download'
             }
           })
         }
-
-
       },
       payment() {
         this.imageUrl = ''

src/views/newTask/listPage.vue

@@ -168,6 +168,7 @@ import {
 } from '@/model/indexRx'
 import { EventBus, formatDate, dayjs } from 'base-core-lib'
 import * as utils from '@/views/workNotification/utils/index.js'
+import axios from 'axios'
 export default {
   name: 'newtask',
   data () {
@@ -380,7 +381,6 @@ export default {
       this.clickSearch()
     },
     goPath (data) {
-      console.log(data, 1234444)
       if (data.businessCode === 'PURCHASE-MA-APPL-REMIND') {
         this.$router.push({ name: 'sparepartMa' })
       } else {
@@ -394,9 +394,27 @@ export default {
         if (!url) {
           EventBus.$emit('error', this.$t('workNotification.noRelatedType'))
         } else {
-            this.$router.push({
+          if(url == 'paymentManagement'){
+            //付款模块传参仓库
+             axios({
+              method: 'get',
+              url: process.env.VUE_APP_BASE_API + '/paymentManagement/getInfo?id='+data.businessId,
+            }).then((response) => {
+              //编辑接口
+              console.log(response)
+              console.log(response.data.data.warehouseName)
+              this.$router.push({
+              name: url,
+              query:{warehouseName:response.data.data.warehouseName}
+            })
+            })
+          }else{
+            debugger
+            console.log(url)
+             this.$router.push({
               name: url
             })
+          }
           // 产品 船舶检查
         }
       }

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -111,7 +111,7 @@
 						<!--预估运费（元/吨）-->
 					<el-form-item label="预估运费（元/吨）" span="1">
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
-							maxlength="20" size="small" />
+							maxlength="20" size="small" type="number"/>
 					</el-form-item>
 					<!--经办人-->
 					<el-form-item label="发货人">
@@ -217,7 +217,7 @@
 							<!--预估运费（元/吨）-->
 					<el-form-item label="预估运费（元/吨）" span="1" >
 						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
-							maxlength="20" size="small"  />
+							maxlength="20" size="small" type="number" />
 					</el-form-item>
 					<!-- 经办人-->
 					<el-form-item label="收货人">
@@ -325,7 +325,7 @@
 							<!--预估运费（元/吨）-->
 					<el-form-item label="预估运费（元/吨）" span="1" >
 						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
-							maxlength="20" size="small"  />
+							maxlength="20" size="small" type="number" />
 					</el-form-item>
 					<!--发货人-->
 					<el-form-item label="发货人">

src/views/warehouse/warehouseManagementGross.vue

@@ -33,7 +33,7 @@
           <!--合同编号-->
           <ws-form-item label="合同编号" span="1" prop="contractNo">
             <el-select filterable clearable v-model="deptBudgetList.contractNo" placeholder="请选择合同编号或移库任务编号"
-              class="typeselect" @change="contractNoChange1">
+              class="typeselect" @change="contractNoChange1" disabled>
               <el-option v-for="item in options1" :key="item.constKey" :label="item.contractNo"
                 :value="item.contractNo" />
             </el-select>

src/views/warehouse/warehouseManagementTare.vue

@@ -32,7 +32,7 @@
           </ws-form-item>
           <ws-form-item label="合同编号" span="1" prop="contractNo">
             <ws-select v-model="deptBudgetList.contractNo" placeholder="请选择合同编号或移库任务编号" class="typeselect"
-              @change='contractNoChange1'>
+              @change='contractNoChange1' disabled>
               <ws-option v-for="item in outContractNo" :key="item.constKey" :label="item.contractNo"
                 :value="item.contractNo" />
             </ws-select>

src/views/workNotification/utils/index.js

@@ -21,6 +21,8 @@ export function code2Url (type, code, state) {
         // 判断 付款
     case 'PAYMENT':
       return payment(code, state)
+    case 'TRADE':
+      return warehouseReceiptRegulation(code, state)
     default:
       return ''
   }
@@ -815,6 +817,13 @@ export function payment (code, state) {
   }
   return undefined
 }
+export function warehouseReceiptRegulation (code, state) {
+  if (code === 'TRADE-WAREHOUSE-REPORT') {
+    // 付款管理
+    return 'tradeServicesManagement'
+  }
+  return undefined
+}
 // 调度
 export function checkDispatch (code, state) {
   let url = ''