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

# Conflicts:
#	src/api/V2/tradeServicesManagement/index.js
#	src/model/tradeServicesManagement/index.js
#	src/views/tradeServicesManagement/warehouseReceiptAdd.vue

src/api/V2/tradeServicesManagement/index.js

@@ -1,8 +1,16 @@
-//贸易服务管理
 // 列表
 export const API_GET_TRADESERVICES_LIST  = '/tradeWarehouseReceiptAppl/selectTradeWarehouseReceiptAppl'
 //获取地图
 export const API_GET_MAPINFO  = '/tradeWarehouseReceiptAppl/getMapInfo'
-
-
+//仓库列表查看
+export const API_GET_WAREHOUSE_LOOK = '/warehouseBaseInfo/getWarehouse'
+//仓单列表添加
+export const API_POST_WAREHOUSE_ADD = '/warehouseBaseInfo/getWarehouse'
+//仓单查看
+export const API_GET_WAREHOUSE_LIST = '/warehouseBaseInfo/getWarehouse'
+//仓单编辑
+export const API_POST_WAREHOUSE_EDIT = '/warehouseBaseInfo/getWarehouse'
+// 获取业务编号
+export const API_GET_BILLNO = '/tradeWarehouseReceiptAppl/getBillNo'
+>>>>>>> 5b4e4575d86211d40882f75b94acb6d1a2bde9d3
 

src/model/tradeServicesManagement/index.js

@@ -1,10 +1,21 @@
 import { errorCatcher, errorHandle, filter } from 'base-core-lib'
 import { appRx } from '../defalutConfig/indexRx'
 import {
-    API_GET_TRADESERVICES_LIST,
-    API_GET_MAPINFO
+    API_GET_MAPINFO,
+    API_POST_WAREHOUSE_ADD,
+    API_GET_WAREHOUSE_LOOK,
+    API_POST_WAREHOUSE_EDIT,
+    API_GET_BILLNO
 } from '@/api/V2/tradeServicesManagement'
 
 // 列表
 export const getList = appRx.get(API_GET_TRADESERVICES_LIST, errorCatcher, errorHandle, filter)
 export const getMapInfo = appRx.get(API_GET_MAPINFO, errorCatcher, errorHandle, filter)
+// 添加
+export const addList = appRx.post(API_POST_WAREHOUSE_ADD, errorCatcher, errorHandle, filter)
+// 查看
+export const getwarehousewarrantList = appRx.get(API_GET_WAREHOUSE_LOOK, errorCatcher, errorHandle, filter)
+// 编辑
+export const editList = appRx.post(API_POST_WAREHOUSE_EDIT, errorCatcher, errorHandle, filter)
+// 获取业务编号
+export const getbillno = appRx.get(API_GET_BILLNO, errorCatcher, errorHandle, filter)

src/views/statisticalReport/huoyunList.vue

@@ -1133,7 +1133,6 @@ export default {
           this.processNoId =this.processNoList[i].id
           this.tranPriceIng = this.processNoList[i].tranPriceIng
           this.priceStatus = this.processNoList[i].priceStatus
-            console.log( this.priceStatus)
         }
       }
       this.getList()

src/views/statisticalReport/shippingList.vue

@@ -112,7 +112,7 @@
       <!-- v-if="actualFreight && tranPriceIng" -->
        <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 == 0?tranPriceIng:actualFreight }}</span>元</span>
+        <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 ? actualFreight : tranPriceIng}}</span>元</span>
         <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>
         <img
               width="17"
@@ -123,6 +123,17 @@
               alt=""
                v-show="!textShow"
             />
+            <span class="span_text">已付：{{amountEdPayable}}元
+                <img
+            width="18"
+            height="20"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png"
+            @click="fujian()"
+            alt=""
+          />{{paymentScreenshotList.length == 0 ? "暂无附件" : paymentScreenshotList.length}}</span>
+            <span class="span_text">未付：{{alreadyInvoice}}元</span>
+            <span class="span_text">{{priceStatus}}</span>
       </div>
 
       <el-table
@@ -131,8 +142,6 @@
         style="width: 100%; margin-top: 20px"
         ref="warehouseList"
         border
-        :summary-method="getSummaries"
-        show-summary
         @row-click="handleRowClick"
         @selection-change="handleSelectionChange"
       >
@@ -349,14 +358,14 @@
       </div>
     </el-dialog>
     <!--磅单 -->
-    <WinseaContentModal
+    <!-- <WinseaContentModal
       v-model="accessoryTFs"
       title="磅单信息"
       @on-cancel="handleClose"
     >
       <p>查看装车磅单</p>
         <img width="100" height="100" :src="loadingImg1" alt="" />
-    </WinseaContentModal>
+    </WinseaContentModal> -->
     <WinseaContentModal
       v-model="accesscard"
       title="磅单信息"
@@ -376,6 +385,15 @@
         <img style="width: 100px; height: 100px" :src="item" alt="" />
       </div>
     </WinseaContentModal>
+
+     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+			@on-cancel="accessoryTFs = false">
+      <div v-for="(item,index) in paymentScreenshotList" :key="index">
+			<!-- <ws-upload ref="upload" :comp-id="compId" :appendix-ids="item" :editable="false"
+				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" /> -->
+        <img :src="item" alt="附件" class="img_css">
+        </div>
+		</WinseaContentModal>
   </div>
   <!-- </div> -->
 </template>
@@ -526,6 +544,10 @@ export default {
           return time.getTime() > Date.now()
         },
       },
+       amountEdPayable : "",//已付金额
+      alreadyInvoice:"",//未付金额
+      priceStatus:"",//状态
+      paymentScreenshotList:[],//付款截图
     }
   },
   activated() {
@@ -1063,7 +1085,8 @@ export default {
              processNoValue:this.taskNoList[i].processNo[j].processNo,
              actualFreight : this.taskNoList[i].processNo[j].actualFreight,
              id:this.taskNoList[i].processNo[j].id,
-             tranPriceIng:this.taskNoList[i].processNo[j].tranPrice
+             tranPriceIng:this.taskNoList[i].processNo[j].tranPrice,
+              priceStatus:this.taskNoList[i].processNo[j].priceStatus
            })
           }
         }
@@ -1076,6 +1099,7 @@ export default {
           this.actualFreight = this.processNoList[i].actualFreight
           this.processNoId =this.processNoList[i].id
           this.tranPriceIng = this.processNoList[i].tranPriceIng
+          this.priceStatus = this.processNoList[i].priceStatus
         }
       }
       this.getList()
@@ -1094,6 +1118,10 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          this.$notify.success({
+                title: '成功',
+                message: '实际运费总价设置成功',
+              })
          this.textShow = false
         })
         })
@@ -1104,37 +1132,37 @@ export default {
       })
     },
     //合计
-    getSummaries(param) {
-      const { columns, data } = param
-      const sums = []
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = '合计'
-        } else if (
-          index === 13 ||
-          index === 14 ||
-          index === 15 ||
-          index === 16
-        ) {
-          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)
-          } else {
-            sums[index] = '元'
-          }
-        } else {
-          sums[index] = '--'
-        }
-      })
-      return sums
-    },
+    // getSummaries(param) {
+    //   const { columns, data } = param
+    //   const sums = []
+    //   columns.forEach((column, index) => {
+    //     if (index === 0) {
+    //       sums[index] = '合计'
+    //     } else if (
+    //       index === 13 ||
+    //       index === 14 ||
+    //       index === 15 ||
+    //       index === 16
+    //     ) {
+    //       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)
+    //       } else {
+    //         sums[index] = '元'
+    //       }
+    //     } else {
+    //       sums[index] = '--'
+    //     }
+    //   })
+    //   return sums
+    // },
     //列表
     getList() {
       autoList({
@@ -1154,12 +1182,11 @@ export default {
             response.records[i].settlementWeightchange = false
             response.records[i].deductionAmountchange = false
             response.records[i].amountNotPayable=response.records[i].amountIngPayable-response.records[i].amountEdPayable
-            //     response.records[i].settlementPrice =
-            //       response.records[i].unitPrice -
-            //       Math.abs(response.records[i].basisPrice) -
-            //       Math.abs(response.records[i].unloadingCharge) -
-            //       Math.abs(response.records[i].invoiceFee) -
-            //       Math.abs(response.records[i].deductionAmount)
+            if(this.processNo){
+                this.amountEdPayable += response.records[i].amountEdPayable // 已付
+                 this.alreadyInvoice += response.records[i].alreadyInvoice//未付
+                this.paymentScreenshotList = response.records[0].paymentScreenshot.split(",")//附件地址取运输阶段第一条
+              } 
           }
           this.deptBudgetTotal = response.total
           this.warehouseList = response
@@ -1523,7 +1550,18 @@ hr {
 .freightSet{
   margin: 10px 0 0 20px;
   display: flex;
-  width:500px;
+  width:800px;
+  .span_text{
+    margin-left: 20px;
+    line-height: 30px;
+  }
+}
+/deep/.freightSet .el-input{
+  width: 44%;
+}
+.findValue{
+  width: 300px;
+  margin-left: 5px;
 }
 /deep/.freightSet .el-input{
   width: 44%;
@@ -1532,4 +1570,8 @@ hr {
   width: 300px;
   margin-left: 5px;
 }
+.img_css{
+  width: 200px;
+  height: 200px;
+}
 </style>

src/views/tradeServicesManagement/warehouseReceiptAdd.vue

@@ -148,6 +148,62 @@
             },
     },
   }
+import {
+		addList,
+		getbillno
+} from '@/model/tradeServicesManagement/index'
+import WsUpload from '@/components/WsUpload'
+export default {
+	components: {
+		WsUpload,
+	},
+	data() {
+		return {
+			deptBudgetList:{},
+			size: 10,
+			compId: sessionStorage.getItem('ws-pf_compId'),
+		}
+	},
+	activated() {
+		this.getList()
+	},
+	methods: {
+		getList(){
+			getbillno().toPromise().then((response) => {
+				this.deptBudgetList.billNo=response
+			})
+		},
+		inoutput(){
+			this.$router.push({ name: 'inOutRecord' })
+		},
+		submit(){
+			this.$confirm(`确定提交审核？`, {
+                  cancelButtonText: '取消',
+                  confirmButtonText: '确定',
+                  type: 'warning',
+                }).then(() => {
+					addList().toPromise().then((response) => {
+						// this.tableData = response.records
+						 this.$message.success('提交成功')
+					}).catch((req) => {
+						// this.tableData = response.records
+						 this.$message.success('提交失败')
+					})
+			})
+		},
+		onChange() {
+			this.$refs.upload
+				.handleSaveBill()
+				.then(async response => {
+				this.deptBudgetList.addressUrl = response
+				})
+				.catch(res => {
+				EventBus.$emit('error', (JSON.parse(res) || {}).message)
+				this.$refs.upload.clearFiles()
+				})
+		},
+	},
+}	
 </script>
 <style lang="scss" scoped>
   /deep/.el-form-item__content{

src/views/tradeServicesManagement/warehouseReceiptEdit.vue

@@ -137,7 +137,7 @@
         </el-form-item>
 		<div>
 			 <el-button @click='inoutput' type="primary">出入库记录</el-button>
-			  <el-button @click='submit'  type="primary">提交审核</el-button>
+			  <el-button @click='submit'  type="primary">重提交</el-button>
 		</div>
 		<div>审核记录</div>
 		 <el-table
@@ -165,7 +165,8 @@
 </template>
 <script>
 	import {
-		getList,
+		getwarehousewarrantList,
+    editList
 	} from '@/model/tradeServicesManagement/index'
 	import WsUpload from '@/components/WsUpload'
 	export default {
@@ -180,14 +181,25 @@
 			}
 		},
 		activated() {
-			
+			this.getList()
 		},
 		methods: {
 		inoutput(){
 			this.$router.push({ name: 'inOutRecord' })
 		},
+    getList(){
+      getwarehousewarrantList.toPromise().then((response) => {
+        this.deptBudgetList=response
+      })
+    },
 		submit(){
-
+      editList().toPromise().then((response) => {
+						// this.tableData = response.records
+						 this.$message.success('提交成功')
+					}).catch((req) => {
+						// this.tableData = response.records
+						 this.$message.success('提交失败')
+					})
 		},
 		onChange() {
 			this.$refs.upload