Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

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_POST_INVOICING = '/paymentManagement/api/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

@@ -129,5 +129,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.post(API_POST_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)
+

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
@@ -332,7 +333,15 @@ export default {
   },
   methods: {
     invoicingClick(){
-    
+      // let data = JSON.stringify({
+      //   paymentManagementList : this.modification
+      // })
+      // //开票
+      //   invoicing(data)
+      //   .toPromise()
+      //   .then(response => {
+      //     console.log(response)
+      //   })
       let data = {
         paymentManagementList : this.modification
       }
@@ -376,8 +385,6 @@ export default {
       })
     },
     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 '打印身份证（正反面）':

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/tranManagementWarehouseInOutTaskEdit.vue

@@ -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' })
         })
     },
     //提交按钮

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>