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

# Conflicts:
#	src/views/statisticalReport/stockSaleOutReportList.vue

public/static/payprint.html

@@ -150,14 +150,13 @@
         align-items: center;
       }
       .sfcard-content img {
-        /* height: 50vh; */
         width: 45%;
         height: 50vh;
       }
       .sfcard-title {
         font-size: 28px;
         text-align: center;
-        margin: 50px 0;
+        margin: 10px 0;
       }
       .avatar {
         margin-bottom: 120px;
@@ -171,14 +170,14 @@
     <div id="app">
       <div class="content" v-if="bigContent">
         <div class="sfcard" v-if="isShowPrintType1">
-          <div class="sfcard-title">身份证</div>
+          <div class="sfcard-title">{{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}}</div>
           <div class="sfcard-content">
             <img :src="imageUrl1" class="avatar" />
             <img :src="imageUrl2" class="avatar" />
           </div>
         </div>
         <div class="bankcard" v-if="isShowPrintType2">
-          <div class="sfcard-title">银行卡</div>
+          <div class="sfcard-title">{{printData.identityAuthenticationInfo.bankDeposit}}{{printData.identityAuthenticationInfo.bankCard}}</div>
           <div class="sfcard-content">
             <img :src="imageUrl3" class="avatar" />
             <img :src="imageUrl4" class="avatar" />
@@ -596,9 +595,10 @@
         let _data = decodeURIComponent(this.getQueryVariable('dataList'))
         this.printData = JSON.parse(_data)
         let _type = decodeURIComponent(this.getQueryVariable('type'))
-        if (sessionStorage.getItem('ws-pf_roleName') == '财务') {
-          this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
-          this.customerList = JSON.parse(decodeURIComponent(this.getQueryVariable('customerList')))
+        this.showType = decodeURIComponent(this.getQueryVariable('printTypeList'))
+        this.customerList = JSON.parse(decodeURIComponent(this.getQueryVariable('customerList')))
+        
+        if (sessionStorage.getItem('cwprint')) {
           this.identity = this.customerList.cardAddressUrl.split(',')
           this.bank = this.customerList.payeeAddressUrl.split(',')
           this.imageUrl1 = this.identity[0]

src/api/V2/houseSelfCollect/index.js

@@ -83,4 +83,7 @@ export const API_GET_INSPECT_GETDRYGRAINPRICE = '/purchasePrice/dryGrainPrice'
 //付款权限查询
 export const API_GET_INSPECT_GETJURISDICTION = '/paymentManagement/selectTaskId'
 //财务开票
-export const API_GET_INVOICING = '/paymentManagement/readXmlManagement'
+// export const API_GET_INVOICING = '/paymentManagement/readXmlManagement'
+//财务开票
+export const API_GET_INVOICING = '/paymentManagement/api/readXmlManagement'
+// export const API_POST_INVOICING ='/paymentManagement/api/readXmlManagement'

src/model/houseSelfCollect/index.js

@@ -43,6 +43,7 @@ import {
   API_GET_CUSTOMER_CODEJY,
   API_GET_INSPECT_GETDRYGRAINPRICE,
   API_GET_INSPECT_GETJURISDICTION,
+  API_POST_INVOICING,
   API_GET_INVOICING
 } from '@/api/V2/houseSelfCollect'
 //客户管理列表
@@ -129,5 +130,8 @@ export const settlementEdit = appRx.post(API_POST_PAYMENT_SETTLEMENTEDIT, errorC
 export const getDryGrainPrice = appRx.get(API_GET_INSPECT_GETDRYGRAINPRICE, errorCatcher, errorHandle, filter)
 //付款权限查询
 export const getJurisdiction  = appRx.get(API_GET_INSPECT_GETJURISDICTION, errorCatcher, errorHandle, filter)
-//财务开票
-export const invoicing  = appRx.get(API_GET_INVOICING, errorCatcher, errorHandle, filter)
+//财务开票get
+// export const invoicing  = appRx.get(API_GET_INVOICING, errorCatcher, errorHandle, filter)
+//财务开票post
+export const invoicing  = appRx.post(API_GET_INVOICING, errorCatcher, errorHandle, filter)
+                                     API_GET_INVOICING

src/router/index.js

@@ -215,7 +215,7 @@ router.beforeEach(async (to, from, next) => {
       }
     }
     renewalHead(data).toPromise().then(() => {
-      console.log(sessionStorage.getItem('paymentManagementReturn'))
+      console.log('paymentManagementReturn',sessionStorage.getItem('paymentManagementReturn'))
       if(to.name=='settlement'&&sessionStorage.getItem('paymentManagementReturn')=='true'){
         next(`/houseSelfCollect/paymentManagement`);
       }else{
@@ -228,6 +228,7 @@ router.beforeEach(async (to, from, next) => {
       next(`/login?redirect=${to.path}`);
     })
   } else {
+    data.routingUri = to.path
     next()
   }
 })

src/views/contractManagement/purchaseContractExamine.vue

@@ -251,7 +251,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
-        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
      </el-table>
     </ws-form>
     

src/views/contractManagement/salesContractAdd.vue

@@ -338,7 +338,7 @@
         :size-limit="size"
         @onChange="onChange" 
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" 
-        v-hasPermission="`contractManagement.salesContractsalesContractInfo.appl`"/>
+        v-hasPermission="`contractManagement.salesContract.salesContractInfo.appl`"/>
       </ws-form>
       <div v-if="dialogVisible" class="map">
         <map-drag @marker="marker" :isShowaddress="true" v-on:addressListen="getAddress" :type="type">

src/views/contractManagement/salesContractEdit.vue

@@ -342,7 +342,7 @@
           maxlength="200" />
         <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
           @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="
-            `contractManagement.salesContractsalesContractInfo.appl`"/>
+            `contractManagement.salesContract.salesContractInfo.appl`"/>
       </ws-form>
     </div>
     <div v-if="dialogVisible" class="map">

src/views/contractManagement/salesContractExamine.vue

@@ -356,7 +356,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
-        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
      </el-table>
       <div style="text-align: right; padding: 10px">
         <el-button

src/views/customerFundManagement/component/router/router.js

@@ -8,7 +8,7 @@ const customerFundManagementRouter = {
     alwaysShow: true, // will always show the root menu
     meta: {
       title: 'customerFundList',
-    //   module: 'customerManagement.customer.customerInfo',
+      module: 'customerMoneyManagement.customerMoney.view',
       icon: '-kehuzijin'
     },
     children: [
@@ -21,7 +21,7 @@ const customerFundManagementRouter = {
         meta: {
           title: 'customerFundList',
           shortcutEntrance: 'customerFundList',
-        //   module: 'customerManagement.customerFundManagement.customerInfo',
+          module: 'customerMoneyManagement.customerMoney.view',
           permissicon: [],
           keepAlive: true
         },
@@ -36,7 +36,7 @@ const customerFundManagementRouter = {
         meta: {
           title: 'customerFundEdit',
           shortcutEntrance: 'customerFundManagement',
-        //   module: 'customerFundManagement.buyContract.buyContractInfo.edit',
+          module: 'customerMoneyManagement.customerMoney.edit',
           permissicon: [],
           keepAlive: true
         },
@@ -51,7 +51,7 @@ const customerFundManagementRouter = {
         meta: {
           title: 'customerFundAdd',
           shortcutEntrance: 'customerFundManagement',
-        //   module: 'customerFundManagement.buyContract.buyContractInfo.add',
+          module: 'customerMoneyManagement.customerMoney.audit',
           permissicon: [],
           keepAlive: true
           // module: 'procurement.sparepart.applDetail'

src/views/customerFundManagement/customerFundList.vue

@@ -27,7 +27,7 @@
         /></ws-button>
 
         <!--添加客户-->
-        <ws-button type="primary" @click="customerAdd()"
+        <ws-button v-hasPermission=" `customerMoneyManagement.customerMoney.audit`" type="primary" @click="customerAdd()"
           ><img
             width="13"
             height="13"
@@ -82,6 +82,7 @@
               size="medium"
               type="text"
               class="record"
+               v-hasPermission=" `customerMoneyManagement.customerMoney.edit`"
               @click="customerEdit(scope.row)"
               >编辑</el-button
             >
@@ -89,6 +90,7 @@
               size="medium"
               type="text"
               class="record"
+               v-hasPermission=" `customerMoneyManagement.customerMoney.delete`"
               @click="customerDel(scope.row)"
               >删除</el-button
             >

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -30,6 +30,7 @@
           >允许手动编辑重量</el-checkbox>
         </div>
       </template>
+    
     </BaseHeaderLayout>
     <!-- <div class="header">
       <div>
@@ -45,7 +46,7 @@
       <acquisitionManagementAdd></acquisitionManagementAdd>
     </el-dialog>
     <div class="table-content">
-      <el-table :data="tableData" style="width: 100%;margin-top: 20px" border height="780">
+      <el-table :data="tableData" style="width: 100%;margin-top: 20px;" border height="600" >
         <el-table-column type="index" label="序号">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -355,5 +356,7 @@ export default {
 
 .paging {
   text-align: center;
+  margin-top:20px
 }
+
 </style>

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

@@ -120,7 +120,7 @@ const houseSelfCollectRouter = {
       meta: {
         title: 'settlement',
         shortcutEntrance: 'settlement',
-        module: 'acquisitionManagement.acquisitionPay.add',
+        module: 'acquisitionManagement.acquisitionPay.view',
         permissicon: [],
         keepAlive: true
       },

src/views/houseSelfCollect/customerManagement.vue

@@ -28,7 +28,7 @@
       </div>
     </div>
 
-    <el-table :data="customertList" style="width: 100%; margin-top: 20px" ref="customertList" border height="780">
+    <el-table :data="customertList" style="width: 100%; margin-top: 20px" ref="customertList" border height="600">
       <el-table-column type="index" label="序号">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -53,7 +53,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <div style="text-align: center">
+    <div style="text-align: center;margin-top:20px">
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
         :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal">
@@ -226,4 +226,7 @@
   /deep/.el-table--enable-row-transition .el-table__body td {
     text-align: center;
   }
+//   /deep/.el-table--border{
+//   height: calc(100vh - 600px) !important;
+// }
 </style>

src/views/houseSelfCollect/inspectInfo.vue

@@ -13,7 +13,7 @@
     </el-row>
     <div class="substance">
       <ws-form>
-        <div style="width: 50%; margin: 0 auto">
+        <div style="width: 80%; margin: 0 auto">
           <div class="title">基本信息</div>
           <ws-info-table>
             <ws-form-item label="仓库" span="1" prop="warehouseName">
@@ -61,8 +61,8 @@
                 <ws-input v-else type="number" @mousewheel.native.prevent v-model="inspect.reBuckleMiscellaneous" placeholder="未复检" maxlength="100" size="small"
                 disabled />
             </ws-form-item>
-            <ws-form-item label="类型" span="1" prop="type">
-              <ws-select v-model="inspect.type" :disabled="disabled2" @change="typeChange">
+            <ws-form-item label="类型" span="1" prop="type"  >
+              <ws-select v-model="inspect.type" :disabled="disabled" @change="typeChange">
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
               </ws-select>
             </ws-form-item>
@@ -802,7 +802,7 @@
               if (this.inspect.goodsName == this.purchasePriceList[i].goodsName) {
                 if ((this.purchasePriceList[i].saleLimit - response/1000 < 50 || count > 0 )&&this.tipFlag) {
                   this.tipFlag = false
-                  this.$message('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit/1000 +'吨。');
+                  this.$message('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit +'吨。');
                 }
               }
             }

src/views/houseSelfCollect/inspectionManagement.vue

@@ -23,7 +23,8 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
 			</template>
 		</BaseHeaderLayout>
-		<el-table :data="inspect" style="width: 100%; margin-top: 20px" ref="inspect" border height="780">
+		<!-- <div style="height:calc(100vh - 600px)"> -->
+		<el-table :data="inspect" style="width: 100%; margin-top: 20px" ref="inspect" border height="600">
 			<el-table-column type="index" label="序号" width="50">
 				<template scope="scope">
 					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -104,6 +105,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
+		
 		 <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单">
 			<!-- <inspectInfoPrint :printData="printData"></inspectInfoPrint> -->
 			<inspectInfoPrint :printData="printData" ref="saveImg"></inspectInfoPrint>
@@ -113,12 +115,13 @@
 				<el-button type="primary" @click="printBig">打印单据</el-button>
 			</div>
 		</el-dialog>
-		<div style="text-align: center">
+		<div style="text-align: center;margin-top:20px">
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
 				:current-page="currentPage" :page-size="deptCircularPage.pageSize"
 				layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
 			</el-pagination>
 		</div>
+		<!-- </div> -->
 	</div>
 </template>
 <script>
@@ -268,6 +271,9 @@
 								this.warehouseCount = _wareHouse.count
 							} 
 						for (let i = 0; i < response.length; i++) {
+							if(_wareHouse && response[i].warehouseName==_wareHouse.value){
+								this.warehouseCount = response[i].count
+							}
 							this.warehouseList.push({
 								value: response[i].warehouseName,
 								id: response[i].id,
@@ -385,4 +391,7 @@
 		width: 45%;
 		display: inline-block;
 	}
+// 	/deep/.el-table--border{
+//   height: calc(100vh - 600px) !important;
+// }
 </style>

src/views/houseSelfCollect/paymentManagement.vue

@@ -125,7 +125,8 @@
           <span v-else>{{ scope.row.status }}</span>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="260">
+      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="300">
+
         <template scope="scope">
           <span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
             <el-button
@@ -155,7 +156,7 @@
               scope.row.approveStatus ||
               (scope.row.status != '待结算' && !scope.row.approveStatus)
             "
-            @click="print(scope.row)"
+            @click="print1(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.finace`"
           >财务打印</el-button>
           <el-button
@@ -332,9 +333,18 @@ export default {
   },
   methods: {
     invoicingClick(){
-      let data = JSON.stringify({
-        paymentManagement :this.modification
-      })
+      // let data = JSON.stringify({
+      //   paymentManagementList : this.modification
+      // })
+      // //开票
+      //   invoicing(data)
+      //   .toPromise()
+      //   .then(response => {
+      //     console.log(response)
+      //   })
+      let data = {
+        paymentManagementList : this.modification
+      }
       console.log('开票',data)
       //开票
       invoicing(data)
@@ -348,33 +358,33 @@ export default {
         response.data.imgList = [
           {
             name:'xml1',
-            src: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png"
+            src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
           },
             {
             name:'xml2',
-            src: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png"
+            src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
           },  {
             name:'xml3',
-            src: "https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png"
+            src: 'https://taohaoliang.oss-cn-beijing.aliyuncs.com/admin/75215bed1ad7408aa73d6474bfe82854.png'
           }
          ]
         this.invoicingImgList = response.data.imgList
         if(response.data.imgList.length>0){
-          for(let i = 0;i<response.data.imgList;i++){
+          for(let i = 0;i<response.data.imgList.length;i++){
           //创建标签下载文件
-            let a = document.createElement("a");
+            let a = document.createElement('a');
             a.href = response.data.imgList[i].src;
-            let urlArr = a.href.split(".");
-            a.setAttribute('download',response.data.imgList[i].name+".xml");
+            let urlArr = a.href.split('.');
+            a.setAttribute('download',response.data.imgList[i].name+'.xml');
             a.click();
             a.remove();
           }
         }
       })
+      .catch(() => {
+      })
     },
     selectType(val) {
-      console.log(val)
-      console.log(this.ruleForm.type)
       for (let i = 0; i < this.ruleForm.type.length; i++) {
         switch (this.ruleForm.type[i]) {
           case '打印身份证（正反面）':
@@ -764,13 +774,14 @@ export default {
           })
       }
     },
+    print1(row) {
+      this.isShowPrintType = true
+      this.rowData = row
+      sessionStorage.setItem('cwprint',true)
+    },
     print(row) {
-      console.log('打印数据', row)
-      if (sessionStorage.getItem('ws-pf_roleName') == '财务') {
-        this.isShowPrintType = true
-        this.rowData = row
-      } else {
-        getpaymentexamine({ id: row.id })
+       sessionStorage.setItem('cwprint',false)
+      getpaymentexamine({ id: row.id })
           .toPromise()
           .then(response => {
             this.printData = response
@@ -787,7 +798,6 @@ export default {
               date.getDate() +
               '日'
           })
-      }
     },
     examine() {
       if (this.modification.length == 0) {

src/views/houseSelfCollect/weighingManagement.vue

@@ -19,7 +19,7 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
 			</template>
 		</BaseHeaderLayout>
-		<el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="780">
+		<el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="600">
 			<el-table-column type="index" label="序号" width="50">
 				<template scope="scope">
 					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -69,7 +69,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		<div style="text-align: center">
+		<div style="text-align: center;margin-top:20px">
 			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
 				:current-page="currentPage" :page-size="deptCircularPage.pageSize"
 				layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">

src/views/statisticalReport/huoyunList.vue

@@ -108,8 +108,8 @@
           </el-select>
         </el-col>
       </el-row>
-      <!-- v-if="actualFreight && tranPriceIng" -->
-      <div class="freightSet" >
+     
+      <div class="freightSet" v-if="processNo">
         <div style="display: flex;width:200px;line-height: 30px;"> 预计运费（元）：{{tranPriceIng}}元</div>
         <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small"  v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight}}</span>元</span>
         <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>
@@ -1533,6 +1533,7 @@ hr {
  width: 100px;
 }
 .freightSet{
+  margin: 10px 0 0 20px;
   display: flex;
   width:500px;
 }

src/views/statisticalReport/shippingList.vue

@@ -110,7 +110,7 @@
         </el-col>
       </el-row>
       <!-- v-if="actualFreight && tranPriceIng" -->
-       <div class="freightSet">
+       <div class="freightSet" v-if="processNo">
         <div style="display: flex;width:200px;line-height: 30px;"> 预计运费（元）：{{tranPriceIng}}元</div>
         <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small"  v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight}}</span>元</span>
         <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>
@@ -1543,6 +1543,7 @@ hr {
  width: 100px;
 }
 .freightSet{
+  margin: 10px 0 0 20px;
   display: flex;
   width:500px;
 }

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

@@ -9,7 +9,7 @@ const tranManagementRouter = {
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'taskManagement',
-    module: 'transportationTask',
+    module: 'transportationTask.transportation.transportationInfo',
     icon: '-renwuguanli'
   },
   children: [

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -383,7 +383,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
-        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+        <el-table-column prop="auditMind" label="审核意见"></el-table-column>
      </el-table>
     </div>
     <!-- 提交 -->

src/views/taskManagement/tranManagementLook.vue

@@ -24,33 +24,27 @@
     <ws-form ref="deptBudgetList" :model="deptBudgetList" :rules="rules">
       <div class="basicInformation">
         <ws-info-table>
-          <!--任务编号-->
           <ws-form-item label="任务编号" span="1" prop="taskNo">
             {{ deptBudgetList.taskNo }}
           </ws-form-item>
-          <!--合同编号-->
           <ws-form-item label="合同编号/移库任务编号" span="1" prop="contractNo">
             {{ deptBudgetList.contractNo }}
           </ws-form-item>
-          <!--货名-->
           <ws-form-item label="货名" span="1" prop="goodsName" class="readonly">
             {{ deptBudgetList.goodsName }}
           </ws-form-item>
-          <!-- 重量（吨） -->
           <ws-form-item label="重量（吨）" span="1" prop="weight">
             {{ deptBudgetList.weight }}
           </ws-form-item>
         </ws-info-table>
         <div class="address">
           <ws-info-table>
-            <!-- 始发地 -->
             <ws-form-item label="始发地" span="1" prop="netWeight">
               {{ deptBudgetList.startPrivate }}{{ deptBudgetList.startCity
               }}{{ deptBudgetList.startArea
               }}{{ deptBudgetList.startDetailedAddress }}
               （{{deptBudgetList.sendWarehouse}}）
             </ws-form-item>
-            <!--终到地-->
             <ws-form-item label="终到地" span="1" prop="netWeight">
               {{ deptBudgetList.endPrivate }}{{ deptBudgetList.endCity
               }}{{ deptBudgetList.endArea
@@ -68,23 +62,29 @@
           </el-checkbox-group>
         </div>
       </div>
-      <div
+     <div
         v-for="(item, index) in deptBudgetList.tranProcessInfoList"
         :key="index"
         class="datafor"
       >
-        <div class="driver">运输阶段&nbsp;&nbsp;{{ index+1 }}&nbsp;&nbsp;({{ item.processNo }}-{{index +1}})</div>
-        <!-- <div class="neifor"> -->
-        <ws-info-table class="el-table">
-          <!--运输方式-->
-          <ws-form-item label="运输方式" span="1" prop="tranType">
+        <div class="driver">运输阶段&nbsp;&nbsp;{{ index+1 }}&nbsp;&nbsp;({{ item.processNo }}-{{index +1}})
+          <el-checkbox
+            class="endflag"
+            true-label="1"
+            disabled
+            false-label="0"
+            v-model="item.endFlag"
+            :label="1"
+            >粮款结算阶段</el-checkbox
+          >
+        </div>
+          <ws-info-table class="el-table">
+         <ws-form-item label="运输方式" span="1" prop="tranType">
             {{ item.tranType }}
           </ws-form-item>
-          <!--发货日期-->
           <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
             {{ item.deliveryDateStart }}
           </ws-form-item>
-          <!--最晚到货日期-->
           <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
             {{ item.deliveryDateEnd }}
           </ws-form-item>
@@ -92,38 +92,23 @@
             {{ item.weight }}
           </ws-form-item>
         </ws-info-table>
-        <!-- </div>-->
         <ws-info-table>
-          <!--发货地区-->
           <ws-form-item label="发货地区" span="1" prop="waterContent">
             {{ item.sendPrivate }}/{{ item.sendCity }}/{{ item.sendArea }}
           </ws-form-item>
-          <!--发货地详细地址-->
-          <ws-form-item
-            label="发货地详细地址"
-            span="1"
-            prop="sendDetailedAddress"
-          >
-            {{ item.sendDetailedAddress }}
-          </ws-form-item>
-          <!--发货人-->
+           <ws-form-item label="发货地详细地址" span="1" prop="sendDetailedAddress">{{ item.sendDetailedAddress }}</ws-form-item> 
           <ws-form-item label="发货人" span="1" prop="sender">
             {{ item.sender }}
           </ws-form-item>
-          <!--发货人电话-->
           <ws-form-item label="发货人电话" span="1" prop="senderPhone">
             {{ item.senderPhone }}
           </ws-form-item>
-        </ws-info-table>
-
-        <!-- <div class="nei"> -->
+        </ws-info-table>    
         <ws-info-table>
-          <!--收货地区-->
           <ws-form-item label="收货地区" span="1" prop="waterContent">
             {{ item.receivePrivate }}/{{ item.receiveCity
             }}/{{ item.receiveArea }}
           </ws-form-item>
-          <!--收货地详细地址-->
           <ws-form-item
             label="收货地详细地址"
             span="1"
@@ -131,17 +116,14 @@
           >
             {{ item.receiveDetailedAddress }}
           </ws-form-item>
-          <!--发货人-->
           <ws-form-item label="收货人" span="1" prop="receiver">
             {{ item.receiver }}
           </ws-form-item>
-          <!--发货人电话-->
           <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
             {{ item.receiverPhone }}
-          </ws-form-item>       
+          </ws-form-item>  
         </ws-info-table>
-        <!-- </div> -->
-      </div>
+      </div> 
       <div style="text-align: right; padding: 10px">
         <el-button
           class="bg-bottom-up"
@@ -250,6 +232,10 @@ export default {
         .then((response) => {
           this.checkList = response.tranType.split(',')
           this.deptBudgetList = response
+          // for (let i = 0; i < this.deptBudgetList.tranProcessInfoList.length; i++) {
+          //   this.deptBudgetList.tranProcessInfoList[i].sendDetailedAddress='黑龙江省黑河市五大连池市沾河林业局'
+            
+          // }
         })
     },
     approve() {},

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -82,7 +82,7 @@
               @click="editClick(scope.row)" alt />
           </template>
         </el-table-column>
-        <el-table-column prop="establishDate" class="table_td" label="创建时间"></el-table-column>
+        <el-table-column prop="establishDate" class="table_td" label="创建时间" width="150"></el-table-column>
         <el-table-column prop="seller" label="操作" width="230">
           <template slot-scope="scope">
             <span class="corles" @click="nocomplete(scope.row)" v-hasPermission="

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -89,17 +89,17 @@
 						</el-select>
 					</el-form-item>
 					<!--容重(克/升)>=-->
-					<el-form-item label="容重(克/升)>=" span="1">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=" span="1">
 						<el-input disabled @input="bulkDensitychange" v-model="dataList.bulkDensity" placeholder="请输入容重"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
 					<!--水分（%）<=-->
-					<el-form-item label="水分（%）<=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
 						<el-input disabled @input="waterContentchange" v-model="dataList.waterContent"
 							placeholder="请输入水分占比" maxlength="120" size="small" class="huom" />
 					</el-form-item>
 					<!--单价(元/吨)-->
-					<el-form-item label="单价(元/吨)">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
 						<el-input disabled @input="unitPricechange" v-model="dataList.unitPrice" placeholder="请输入单价"
 							maxlength="120" size="small" class="huom" />
 					</el-form-item>
@@ -192,19 +192,19 @@
 						</el-select>
 					</el-form-item>
 					<!--容重(克/升)>=-->
-					<el-form-item label="容重(克/升)>=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
 						<el-input @input="bulkDensitychange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.bulkDensity" placeholder="请输入容重" maxlength="120" size="small"
 							class="huom" />
 					</el-form-item>
 					<!--水分（%）<=-->
-					<el-form-item label="水分（%）<=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
 						<el-input @input="waterContentchange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.waterContent" placeholder="请输入水分占比" maxlength="120" size="small"
 							class="huom" />
 					</el-form-item>
 					<!--单价(元/吨)-->
-					<el-form-item label="单价(元/吨)">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
 						<el-input @input="unitPricechange" :disabled="dataList.taskTypeKey == 3"
 							v-model="dataList1.unitPrice" placeholder="请输入单价" maxlength="120" size="small"
 							class="huom" />
@@ -300,19 +300,19 @@
 						</el-select>
 					</el-form-item>
 					<!--容重(克/升)>=-->
-					<el-form-item label="容重(克/升)>=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
 						<el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.bulkDensity" placeholder="请输入容重" maxlength="120" size="small"
 							class="huom" />
 					</el-form-item>
 					<!--水分（%）<=-->
-					<el-form-item label="水分（%）<=">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
 						<el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.waterContent" placeholder="请输入水分占比" maxlength="120" size="small"
 							class="huom" />
 					</el-form-item>
 					<!--单价(元/吨)-->
-					<el-form-item label="单价(元/吨)">
+					<el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
 						<el-input :disabled="dataList.taskTypeKey == 3 || dataList.taskTypeKey == 4"
 							v-model="dataList.unitPrice" placeholder="请输入单价" maxlength="120" size="small"
 							class="huom" />
@@ -1069,86 +1069,6 @@
 						})
 						return
 					}
-					if (!this.dataList1.bulkDensity) {
-						this.$message({
-							message: '容重不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						this.dataList1.bulkDensity < 500 ||
-						this.dataList1.bulkDensity > 1000
-					) {
-						this.$message({
-							message: '容重输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						String(this.dataList1.bulkDensity).indexOf('.') != -1 &&
-						String(this.dataList1.bulkDensity).length -
-						(String(this.dataList1.bulkDensity).indexOf('.') + 1) >
-						0
-					) {
-						this.$message({
-							message: '容重需输入整数',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.waterContent) {
-						this.$message({
-							message: '水分不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						this.dataList1.waterContent < 0 ||
-						this.dataList1.waterContent > 40
-					) {
-						this.$message({
-							message: '水分输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						String(this.dataList1.waterContent).indexOf('.') != -1 &&
-						String(this.dataList1.waterContent).length -
-						(String(this.dataList1.waterContent).indexOf('.') + 1) >
-						1
-					) {
-						this.$message({
-							message: '水分输入错误',
-							type: 'warning'
-						})
-						return
-					}
-					if (!this.dataList1.unitPrice) {
-						this.$message({
-							message: '单价不能为空！',
-							type: 'warning'
-						})
-						return
-					}
-					if (
-						(this.dataList1.unitPrice &&
-							String(this.dataList1.unitPrice).indexOf('.') != -1 &&
-							String(this.dataList1.unitPrice).length -
-							(String(this.dataList1.unitPrice).indexOf('.') + 1) >
-							2) ||
-						this.dataList1.unitPrice > 100000 ||
-						this.dataList1.unitPrice < 1
-					) {
-						this.$message({
-							message: '单价输入错误',
-							type: 'warning'
-						})
-						return
-					}
 					if (!this.dataList.predictDate) {
 						this.$message({
 							message: '预计出库日期不能为空！',
@@ -1494,6 +1414,7 @@
 					this.inOutTaskNo = 'YKC' + random
 					this.inOutTaskNo1 = 'YKR' + random
           this.dataList.moveTaskNo = 'YKRW' + random
+		   this.dataList1.moveTaskNo = 'YKRW' + random
 				} else if (this.dataList.taskTypeKey == 4) {
 					var random = this.getdate() + this.MathRand()
 					this.inOutTaskNo = 'TCC' + random
@@ -1598,7 +1519,7 @@
 				//     this.deliveryType = response
 				//   })
 				//仓库名
-				debugger
+				// debugger
 				getwarehousename({
 						compId: this.compId,
 						warehouseType: 1
@@ -1775,7 +1696,6 @@
 		position: relative;
 		top: 50px;
 		width: 40%;
-		height: 2000px;
 		margin: 0 auto;
 		margin-right: 180px;
 	}

src/views/taskManagement/tranManagementWarehouseInOutTaskAudit.vue

@@ -201,7 +201,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               v-model="dataList.bulkDensity"
@@ -212,7 +212,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
             <el-input
               @input="waterContentchange"
               v-model="dataList.waterContent"
@@ -223,7 +223,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
             <el-input
               @input="unitPricechange"
               v-model="dataList.unitPrice"
@@ -454,7 +454,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               :disabled="dataList.taskTypeKey == 3"
@@ -466,7 +466,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=">
             <el-input
               @input="waterContentchange"
               :disabled="dataList.taskTypeKey == 3"
@@ -478,7 +478,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
             <el-input
               @input="unitPricechange"
               :disabled="dataList.taskTypeKey == 3"
@@ -694,7 +694,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               disabled
               v-model="dataList.bulkDensity"
@@ -705,7 +705,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<="
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<="
             <el-input
               disabled
               v-model="dataList.waterContent"
@@ -716,7 +716,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)">
             <el-input
               disabled
               v-model="dataList.unitPrice"
@@ -804,7 +804,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="createTime" label="审核时间"></el-table-column>
-      <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+      <el-table-column prop="auditMind" label="审核意见"></el-table-column>
     </el-table>
     <WinseaContentModal
       v-model="outerVisible"

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -170,7 +170,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               v-model="dataList.bulkDensity"
@@ -181,7 +181,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
               @input="waterContentchange"
               v-model="dataList.waterContent"
@@ -192,7 +192,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
             <el-input
               @input="unitPricechange"
               v-model="dataList.unitPrice"
@@ -375,7 +375,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               @input="bulkDensitychange"
               :disabled="dataList.taskTypeKey == 3"
@@ -387,7 +387,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
               @input="waterContentchange"
               :disabled="dataList.taskTypeKey == 3"
@@ -399,7 +399,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
             <el-input
               @input="unitPricechange"
               :disabled="dataList.taskTypeKey == 3"
@@ -582,7 +582,7 @@
             </el-select>
           </el-form-item>
           <!--容重(克/升)>=-->
-          <el-form-item label="容重(克/升)>=">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="容重(克/升)>=">
             <el-input
               :disabled="dataList.taskTypeKey == 3||dataList.taskTypeKey == 4"
               v-model="dataList.bulkDensity"
@@ -593,7 +593,7 @@
             />
           </el-form-item>
           <!--水分（%）<=-->
-          <el-form-item label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="水分（%）<=" span="1" style=" margin-left: 350px; margin-top: -40px">
             <el-input
               :disabled="dataList.taskTypeKey == 3||dataList.taskTypeKey == 4"
               v-model="dataList.waterContent"
@@ -604,7 +604,7 @@
             />
           </el-form-item>
           <!--单价(元/吨)-->
-          <el-form-item label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
+          <el-form-item v-if='dataList.taskTypeKey != 3||dataList1.taskTypeKey != 3' label="单价(元/吨)" span="1" style=" margin-left: 650px; margin-top: -40px">
             <el-input
               :disabled="dataList.taskTypeKey == 3||dataList.taskTypeKey == 4"
               v-model="dataList.unitPrice"
@@ -941,8 +941,8 @@ export default {
         .toPromise()
         .then(response => {
           this.$message.success('编辑成功')
-          this.$router.go(-1)
-          // this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
+          // this.$router.go(-1)
+          this.$router.push({ path: 'tranManagementWarehouseInOuttask' })
         })
     },
     //提交按钮
@@ -1271,7 +1271,8 @@ export default {
           })
           return
         }
-        if (!this.dataList1.bulkDensity) {
+        if( this.dataList.taskTypeKey != 3||this.dataList1.taskTypeKey != 3){
+          if (!this.dataList1.bulkDensity) {
           this.$message({
             message: '容重不能为空！',
             type: 'warning'
@@ -1351,6 +1352,8 @@ export default {
           })
           return
         }
+        }
+        
         if (!this.dataList.predictDate) {
           this.$message({
             message: '预计出库日期不能为空！',

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

@@ -112,7 +112,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementVehicle',
         shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.vehicleDispatching',
+        module: 'tranManager.vehicleDispatching',
         permissicon: [],
         keepAlive: true
       },
@@ -187,7 +187,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementVehicleDispatching',
         shortcutEntrance: 'transportationTask',
-        module: 'transportationTask.transportation.vehicleDispatching.car',
+        module: 'tranManager.vehicleDispatching.car',
         permissicon: [],
         keepAlive: true
       },
@@ -202,7 +202,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementVehicleLook',
         shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.vehicleDispatching.view',
+        module: 'tranManager.vehicleDispatching.view',
         permissicon: [],
         keepAlive: true
       },

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -231,6 +231,9 @@
             <span class="servicedout" v-show="item.status == '已送达'"
               >已卸车</span
             >
+            <span class="servicedout" v-show="item.status == '已装车'"
+              >未卸车</span
+            >
             <span class="noserviceout" v-show="item.status == '未装车'">{{
               item.status
             }}</span>

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -241,7 +241,7 @@
                 label="卸车日期:"
                 span="1"
                 prop="receiveDateEnd"
-                style="width: 275px"
+                style="width: 340px"
               >
                 <ws-date-picker
                   v-model="item.receiveDateEnd"
@@ -801,7 +801,7 @@ export default {
   left: 0;
 }
 .el-form {
-  padding: 0 10%;
+  padding: 0 5%;
 }
 .el-button--primary {
   background-color: #5878e8;

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -126,7 +126,7 @@
             >
            </div>
           </div>
-          <div
+        <div
             class="position siji"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
             :key="index"
@@ -435,7 +435,7 @@
             <img width="22" height="22" src="../../../public/img/add.png" alt />
             <div class="spans">添加仓位</div>
           </el-button>
-        </div>
+          </div>
       </ws-form>
       <div style="text-align: right; padding: 10px">
         <el-button
@@ -931,8 +931,7 @@ export default {
   padding: 16px 20px;
 }
 .center {
-  width: 90%;
-  // margin: 0 auto;
+  margin: 0 auto;
 }
 
 //表格文字
@@ -999,15 +998,13 @@ export default {
   color: #8890b1;
   line-height: 16px;
 }
-.position {
-  width: 90%;
-}
+
 //下表格样式
 .position.siji {
   background: white;
   border-radius: 4px;
   /* border: 1px solid #d8dce6; */
-  width: 1219px;
+  // width: 1219px;
 }
 /deep/.zi {
   width: 64px;
@@ -1040,7 +1037,7 @@ export default {
 }
 /deep/.basicInformation {
   .el-form-item {
-    width: 25%;
+    // width: 25%;
 
     .el-form-item__label {
       background: transparent;
@@ -1085,22 +1082,23 @@ export default {
 }
 .basicInformation .ws-info-table {
   border: none;
-  width: 1000px;
+  width: 100%;
+  margin: 0 auto;
 }
 /deep/.el-select .el-input__inner {
   border: 1px solid #ccc !important;
   padding: 0 15px !important;
   font-size: 12px !important;
-  width: 125px;
+  // width: 125px;
 }
 .zhong {
-  height: 111px;
   background: #f6f7fc;
   border-radius: 4px;
   border: 1px solid #d8dce6;
-  width: 99%;
-  margin: 0 2%;
-  // margin-left: -76px;
+  width: 100%;
+}
+/deep/.zhong .el-form-item{
+  width: 20%;
 }
 .bg-left {
   padding-left: 30px;
@@ -1109,12 +1107,7 @@ export default {
   padding-left: 30px;
   width: 150px;
 }
-.basicInformation .ws-info-table {
-  border: none;
-  width: 141%;
-  margin: 0 auto;
-  // margin-left: -89px;
-}
+
 .ys {
   // margin-left: 300px;
   width: 100px;
@@ -1166,9 +1159,7 @@ export default {
   left: 0px;
   top: 13px;
 }
-.position {
-  position: relative;
-}
+
 
 .del {
   // position: absolute;
@@ -1189,12 +1180,11 @@ export default {
   width: 300px;
   height: 300px;
 }
-.el-form {
-  padding: 0 15%;
-}
+
 /deep/.ws-info-table .el-form-item {
   border-right: 1px solid transparent;
   border-bottom: 1px solid transparent;
+  width: 33.3333%;
 }
 .readonly {
   position: relative;
@@ -1227,16 +1217,28 @@ export default {
 .el-col {
   background: #f6f7fc;
 }
+
 /deep/.ws-info-table .el-form-item .el-form-item__content {
+  background: #f5f7fa;
+  border-radius: 4px;
+  // border: 1px solid #d8dce6;
+  margin-bottom: 5px;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
   padding: 0 25px;
-  border-left: 1px solid transparent;
-  background: #fff;
+  // border-left: 1px solid transparent;
+  border: none;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 100px;
   text-align: center;
   background: #fff;
-  // border: 1px solid #cdd2dc;
+  font-size: 14px;
+  font-weight: 400;
+  color: #8890b1;
+  line-height: 16px;
 }
 .button-container {
   display: flex;
@@ -1299,14 +1301,9 @@ export default {
   padding-right: 10px;
   text-align: right;
 }
-.center {
-  width: 86%;
-  // margin: 0 auto;
-  // margin: 0 -29%;
-}
-.el-form-item {
-  width: 50%;
-}
+// .el-form-item {
+//   width: 50%;
+// }
 .el-form-item__label {
   text-align: center;
 }
@@ -1359,8 +1356,6 @@ export default {
     display: none;
   }
   .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
     color: #000 !important;
     font-size: 14px;
     cursor: text;
@@ -1374,9 +1369,7 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
-.ws-info-table .el-form-item {
-  width: 33.3333%;
-}
+
 .readonly:after {
   display: none;
 }
@@ -1385,6 +1378,7 @@ export default {
 }
 .el-form {
   margin-top: 50px;
+  padding: 0 15%;
 }
 .readonly {
   width: 16%;
@@ -1399,35 +1393,8 @@ export default {
   border-left: 0px;
   border-top: 0px;
 }
-/deep/.ws-info-table .el-form-item {
-  border: none;
-  height: 50px;
-  // margin: 0 auto;
-}
-/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;
-  font-weight: 400;
-  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;
 }
@@ -1463,20 +1430,7 @@ export default {
 //   border-radius: 10px;
 //   right: 20px;
 // }
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  /* background-color: #fff; */
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-  background: border-box;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  /* border: 1px solid #d8dce6; */
-  border: none;
-}
+
 /deep/.basicInformation .el-form-item .el-form-item__label {
   background: transparent;
   border: none;
@@ -1487,9 +1441,9 @@ export default {
   line-height: 16px;
   margin-left: 22px;
 }
-/deep/.el-form-item__content .el-select {
-  width: 42%;
-}
+// /deep/.el-form-item__content .el-select {
+//   width: 42%;
+// }
 //减号
 .del {
   position: absolute;

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -811,8 +811,6 @@ export default {
     display: none;
   }
   .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
     color: #000 !important;
     font-size: 14px;
     cursor: text;
@@ -947,4 +945,5 @@ export default {
     height: 40px;
     margin: 20px 0;
   }
+
 </style>

src/views/tranManagement/tranManagementVehicle.vue

@@ -149,10 +149,10 @@
         <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
             <div v-hasPermission="
-                'transportationTask.transportation.vehicleDispatching.view'
+                'tranManager.vehicleDispatching.view'
               " class="record" @click="nocomplete(scope.row)">查看</div>
             <div v-hasPermission="
-                'transportationTask.transportation.vehicleDispatching.car'
+                'tranManager.vehicleDispatching.car'
               " class="adjustment" @click="warehousing(scope.row)">派车</div>
           </template>
         </el-table-column>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -115,7 +115,7 @@
               <div v-if="deptBudgetList.priceStatus=='审核中'">
                 <el-button
               type="primary"
-              v-hasPermission="`tranManager.transportationInfo.exe`"
+              v-hasPermission="`tranManager.vehicleDispatching.price`"
               size="small"
               @click="examine()"
               >审核中</el-button

src/views/warehouse/warehouseManagementGross.vue

@@ -652,6 +652,7 @@ export default {
         addressUrl:'',
         warehouseInOutDetail: {},
         deductionAmount:0,
+        deductionWeight:0,
         grossWeight:0,
         tare:0
       },
@@ -891,7 +892,7 @@ export default {
       for (let i = 0; i < this.tranCarInfoList.length; i++) {
         if (this.tranCarInfoList[i].carNo == this.deptBudgetList.carNo) {
           this.deptBudgetList.tranCarNo=this.tranCarInfoList[i].tranCarNo
-          this.deptBudgetList.freight = this.tranCarInfoList[i].tranPrice
+          this.deptBudgetList.freight = Math.round(this.tranCarInfoList[i].tranPrice)
         }
       }
     },
@@ -1205,13 +1206,13 @@ export default {
       //   })
       //   return
       // }
-      if (!this.deptBudgetList.addressUrl) {
-        this.$message({
-          message: '附件不能为空',
-          type: 'warning',
-        })
-        return
-      }
+      // if (!this.deptBudgetList.addressUrl) {
+      //   this.$message({
+      //     message: '附件不能为空',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
       //自检员
       if (this.deptBudgetList.warehouseInOutDetail.qualityInspector) {
         if (
@@ -1408,7 +1409,6 @@ export default {
         }
       }
       console.log(this.deptBudgetList, '入库对象')
-      this.deptBudgetList.id = this.$route.query.id
       this.$confirm(`确定提交入库信息`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -1422,15 +1422,36 @@ export default {
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.pcFlag = 1
               this.deptBudgetList.statusFlag = 3
-              his.deptBudgetList.grossWeight /= 1000
-                this.deptBudgetList.tare /= 1000
-                this.deptBudgetList.netWeight /= 1000
-                this.deptBudgetList.pureWeight /= 1000
-                this.deptBudgetList.deductionAmount *= 1000
-                this.deptBudgetList.deductionWeight /= 1000
+              this.deptBudgetList.grossWeight = (this.deptBudgetList.grossWeight/1000).toFixed(2)
+              this.deptBudgetList.tare = (this.deptBudgetList.tare/1000).toFixed(2)
+              this.deptBudgetList.netWeight = (this.deptBudgetList.netWeight/1000).toFixed(2)
+              if(!this.deptBudgetList.pureWeight){
+                this.deptBudgetList.pureWeight = 0
+              }
+              this.deptBudgetList.pureWeight = (this.deptBudgetList.pureWeight/1000).toFixed(2)
+              if(!this.deptBudgetList.deductionWeight){
+                this.deptBudgetList.deductionWeight = 0
+              }
+              if(!this.deptBudgetList.deductionAmount){
+                this.deptBudgetList.deductionAmount = 0
+              }
+              this.deptBudgetList.deductionWeight = (this.deptBudgetList.deductionWeight/1000).toFixed(2)
+              this.deptBudgetList.deductionAmount = Math.round(this.deptBudgetList.deductionAmount*1000)
+              
+              // this.deptBudgetList.grossWeight /= 1000
+              //   this.deptBudgetList.tare /= 1000
+              //   this.deptBudgetList.netWeight /= 1000
+              //   this.deptBudgetList.pureWeight /= 1000
+              //   this.deptBudgetList.deductionAmount *= 1000
+              //   this.deptBudgetList.deductionWeight /= 1000
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {
+                  // this.deptBudgetList.grossWeight = Math.round(this.dataList.grossWeight*1000)
+                  // this.deptBudgetList.tare = Math.round(this.dataList.tare*1000)
+                  // this.deptBudgetList.netWeight = Math.round(this.dataList.netWeight*1000)
+                  // this.deptBudgetList.pureWeight = Math.round(this.dataList.pureWeight*1000)
+                  // this.deptBudgetList.deductionWeight = Math.round(this.dataList.deductionWeight*1000)
                   this.$message.success('添加成功')
                   this.$router.push({ path: 'warehouseManagementList' })
                 })

src/views/warehouse/warehouseManagementList.vue

@@ -66,12 +66,12 @@
         /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <div v-show="this.warehouseType == '1'">
+    <div v-show="this.warehouseType == '1'" class="main_css">
       <el-table
         class="wenzi"
         :data="warehouseList"
         style="width: 100%; margin-top: 20px"
-        height="780"
+        height="100%"
       >
         <el-table-column prop="warehouseName" label="仓库名" >
         </el-table-column>
@@ -815,5 +815,8 @@ export default {
     font-weight: 700;
     margin-bottom: 20px;
 }
+.main_css{
+  height: calc(100vh - 124px);
+}
 
 </style>

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -1,3 +1,4 @@
+//检斤待完成
 <template>
   <div class="container">
     <el-row>
@@ -20,7 +21,8 @@
         >
       </el-col>
     </el-row>
-    <ws-form ref="deptBudgetList" :v-model="deptBudgetList">
+    <el-main class="main_css">
+<ws-form ref="deptBudgetList" :v-model="deptBudgetList">
       <div class="center">
         <h2 style="padding-left: 20px">
           <img
@@ -114,6 +116,8 @@
        
       </div>
     </ws-form>
+    </el-main>
+    
   </div>
 </template>
 <script>
@@ -551,4 +555,7 @@ export default {
   color: #ffffff;
   line-height: 20px;
 }
+.main_css{
+height: calc(100vh - 120px);
+}
 </style>

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -610,14 +610,14 @@ export default {
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
     this.getList()
     this.dataList.id = this.$route.query.id
-    this.dataList.grossWeight = this.$route.query.grossWeight*1000
+    this.dataList.grossWeight = Math.round(this.$route.query.grossWeight*1000)
     this.dataList.contractNo = this.$route.query.contractNo
     this.dataList.baseId = this.$route.query.baseId
     this.dataList.positionId = this.$route.query.positionId
     this.dataList.warehouseName = this.$route.query.warehouseName
     this.dataList.binNumber = this.$route.query.binNumber
-    this.dataList.tare = this.$route.query.tare*1000
-    this.dataList.netWeight = this.$route.query.netWeight*1000
+    this.dataList.tare = Math.round(this.$route.query.tare*1000)
+    this.dataList.netWeight = Math.round(this.$route.query.netWeight*1000)
     this.dataList.grade = this.$route.query.grade
     this.dataList.agent = this.$route.query.agent
     this.dataList.carNo = this.$route.query.carNo
@@ -640,9 +640,9 @@ export default {
     this.dataList.buckleWeightRatio=this.$route.query.buckleWeightRatio
     this.dataList.tidalGrainWater=this.$route.query.tidalGrainWater
     this.dataList.solidGrainWater=this.$route.query.solidGrainWater
-    this.dataList.pureWeight=this.$route.query.pureWeight*1000
+    this.dataList.pureWeight=Math.round(this.$route.query.pureWeight*1000)
     this.dataList.deductionAmount=this.$route.query.deductionAmount/1000
-    this.dataList.deductionWeight=this.$route.query.deductionWeight*1000
+    this.dataList.deductionWeight=Math.round(this.$route.query.deductionWeight*1000)
     this.dataList.inOutTypeFlag=1
     this.dataList.inOutTaskNo = this.$route.query.inOutTaskNo
     if(this.dataList.cost){
@@ -1374,21 +1374,27 @@ export default {
               this.dataList.compId = sessionStorage.getItem('ws-pf_compId')
               this.dataList.inOutFlag = 2
               this.dataList.statusFlag = 3
-              this.dataList.grossWeight /= 1000
-              this.dataList.tare /= 1000
-              this.dataList.netWeight /= 1000
-              this.dataList.pureWeight /= 1000
+              this.dataList.grossWeight = (this.dataList.grossWeight/1000).toFixed(2)
+              this.dataList.tare = (this.dataList.tare/1000).toFixed(2)
+              this.dataList.netWeight = (this.dataList.netWeight/1000).toFixed(2)
+              this.dataList.pureWeight = (this.dataList.pureWeight/1000).toFixed(2)
               if(!this.dataList.deductionWeight){
                 this.dataList.deductionWeight = 0
               }
               if(!this.dataList.deductionAmount){
                 this.dataList.deductionAmount = 0
               }
-              this.dataList.deductionWeight /= 1000
-              this.dataList.deductionAmount *= 1000
+              this.dataList.deductionWeight = (this.dataList.deductionWeight/1000).toFixed(2)
+              this.dataList.deductionAmount = Math.round(this.dataList.deductionAmount*1000)
+
               addstorageputList(this.dataList)
                 .toPromise()
                 .then((response) => {
+                  this.dataList.grossWeight = Math.round(this.dataList.grossWeight*1000)
+                  this.dataList.tare = Math.round(this.dataList.tare*1000)
+                  this.dataList.netWeight = Math.round(this.dataList.netWeight*1000)
+                  this.dataList.pureWeight = Math.round(this.dataList.pureWeight*1000)
+                  this.dataList.deductionWeight = Math.round(this.dataList.deductionWeight*1000)
                   this.$message.success('提交成功')
                   this.$confirm(`是否打印磅单`, {
                     cancelButtonText: '取消',
@@ -1403,8 +1409,9 @@ export default {
                         .then((response) => {
                             window.open( '../../../../static/weightCheckInOut.html?type=2&tableData=' +JSON.stringify(response))
                         })
-                      this.$router.push({ path: 'warehouseManagementList' })
+                      
                     })
+                    this.$router.push({ path: 'warehouseManagementList' })
                     .catch(() => {
                       return false
                     })

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -521,14 +521,14 @@ export default {
     this.deptBudgetList1.binNumber = this.$route.query.binNumber
     this.getList()
     this.dataList.id = this.$route.query.id
-    this.dataList.grossWeight = this.$route.query.grossWeight*1000
+    this.dataList.grossWeight = Math.round(this.$route.query.grossWeight*1000)
     this.dataList.contractNo = this.$route.query.contractNo
     this.dataList.baseId = this.$route.query.baseId
     this.dataList.positionId = this.$route.query.positionId
     this.dataList.warehouseName = this.$route.query.warehouseName
     this.dataList.binNumber = this.$route.query.binNumber
-    this.dataList.tare = this.$route.query.tare*1000
-    this.dataList.netWeight = this.$route.query.netWeight*1000
+    this.dataList.tare = Math.round(this.$route.query.tare*1000)
+    this.dataList.netWeight = Math.round(this.$route.query.netWeight*1000)
     this.dataList.grade = this.$route.query.grade
     this.dataList.agent = this.$route.query.agent
     this.dataList.carNo = this.$route.query.carNo

src/views/warehouse/warehouseManagementRecord.vue

@@ -43,7 +43,7 @@
 					<img v-if="status == 3" width="18" height="18" src="../../../public/img/radio-check.png"
 						alt="" />入库记录
 				</div>
-				<el-table :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'">
+				<el-table show-summary :summary-method="getSummaries"   :data="warehouseList.records" height="560" v-show="this.warehouseType== '1'">
 					<el-table-column type="expand">
 						<template #default="props">
 							<ws-form ref="deptBudgetList" :model="deptBudgetList">
@@ -133,7 +133,7 @@
 						<template slot-scope="scope">
 							<!-- <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
 								src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" /> -->
-          					<el-button @click="print(scope.row)"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
+          					<el-button @click="print(scope.row)" v-if="scope.row.inOutType != '收购入库'"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
 
 						</template>
 					</el-table-column>
@@ -144,7 +144,7 @@
 					</el-table-column>
 
 				</el-table>
-				<el-table :data="warehouseList.records" height="560" v-show="this.warehouseType== '2'">
+				<el-table show-summary :summary-method="getSummaries" :data="warehouseList.records" height="560" v-show="this.warehouseType== '2'">
 					<el-table-column type="expand">
 						<template #default="props">
 							<ws-form ref="deptBudgetList" :model="deptBudgetList">
@@ -354,6 +354,34 @@
 			this.showType = this.isShow
 		},
 		methods: {
+			//合计
+			getSummaries(param) {
+				const { columns, data } = param
+				const sums = []
+				columns.forEach((column, index) => {
+					if (index === 0) {
+						sums[index] = '合计'
+					} else if (
+						index === 7 
+					) {
+						const values = data.map((item) => Number(item[column.property]))
+						if (!values.every((value) => isNaN(value))) {
+							sums[index] = values.reduce((prev, curr) => {
+								const value = Number(curr)
+								if (!isNaN(value)) {
+									return prev + curr
+								} else {
+									return prev
+								}
+								}, 0)
+							sums[index] = sums[index].toFixed(3)
+						}
+					} else {
+						sums[index] = '--'
+					}
+				})
+				return sums
+			},
 			print(row){
 				getPrintInfo({
                         id: row.id

src/views/warehouse/warehouseManagementTare.vue

@@ -1223,7 +1223,7 @@ export default {
       }
       if (
         this.deptBudgetList.contractNo.length < 6 ||
-        this.deptBudgetList.contractNo.length > 20
+        this.deptBudgetList.contractNo.length > 50
       ) {
         this.$message({
           message: '合同编号输入有误！',

vue.config.js

@@ -141,8 +141,8 @@ module.exports = {
         // target: 'https://product-server.winsea.com/', //目标地址
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
-        target: 'http://192.168.1.122:9100/',
-        // target: 'http://192.168.1.119:8090/',
+        // target: 'http://192.168.1.122:9100/',
+        target: 'http://192.168.1.107:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址