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

src/api/V2/tradeServicesManagement/index.js

@@ -1,6 +1,15 @@
-//贸易服务管理
 // 列表
 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_RECEIPTAPPL_ADD = '/tradeWarehouseReceiptAppl/api/insertTradeWarehouseReceiptAppl'
+//仓单查看
+export const API_GET_WAREHOUSE_LIST = '/warehouseBaseInfo/getWarehouse'
+//仓单编辑
+export const API_POST_WAREHOUSE_EDIT = '/warehouseBaseInfo/getWarehouse'
+// 获取业务编号
+export const API_GET_BILLNO = '/tradeWarehouseReceiptAppl/getBillNo'
 

src/model/tradeServicesManagement/index.js

@@ -1,8 +1,22 @@
 import { errorCatcher, errorHandle, filter } from 'base-core-lib'
 import { appRx } from '../defalutConfig/indexRx'
 import {
-    API_GET_TRADESERVICES_LIST
+    API_GET_MAPINFO,
+    API_GET_WAREHOUSE_LOOK,
+    API_POST_WAREHOUSE_EDIT,
+    API_GET_BILLNO,
+    API_GET_TRADESERVICES_LIST,
+    API_POST_RECEIPTAPPL_ADD
 } 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_RECEIPTAPPL_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

@@ -1,84 +1,97 @@
 //创建仓单
 <template>
-  <div>
-    <el-form ref="deptBudgetList" :rules="mainReportAdd" :model="deptBudgetList">
+  <div class="center">
+    <el-row>
+      <el-col :span="12">
+        <h2 class="bg-left titleup">创建仓单</h2>
+      </el-col>
+      <el-col :span="12" class="bg-right">
+        <el-button class="bg-bottom" type="primary" size="small" @click="cancel"><img width="6" height="10"
+            style="vertical-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
+        </el-button>
+      </el-col>
+    </el-row>
+    <el-form :inline="true" ref="deptBudgetList" label-position="right" class="content2" :rules="rules"
+      :model="deptBudgetList" label-width="120px">
+      <div class="title1">申请信息</div>
       <!-- <ws-info-table class="el-table"> -->
-      <div>申请信息</div>
-      <el-form-item label="业务编号" span="1" prop="taskNo" class="forlist">
-        <el-input v-model="deptBudgetList.taskNo" placeholder="请输入任务编号" maxlength="20" size="small" disabled></el-input>
-      </el-form-item>
-      <el-form-item label="名头" span="1" prop="taskNo" class="forlist">
-        <el-select v-model="deptBudgetList.region" placeholder="请选择名头">
-          <el-option label="区域一" value="shanghai"></el-option>
-          <el-option label="区域二" value="beijing"></el-option>
-        </el-select>
+      <el-form-item label="业务编号" prop="billNo" class="forlist">
+        <el-col>
+          <el-input v-model="deptBudgetList.billNo" placeholder="请输入任务编号" maxlength="20" size="small" disabled>
+          </el-input>
+        </el-col>
+
       </el-form-item>
-      <el-form-item label="仓库名称" span="1" prop="taskNo" class="forlist">
-        <el-select v-model="deptBudgetList.region" placeholder="请选择仓库">
-          <el-option label="区域一" value="shanghai"></el-option>
-          <el-option label="区域二" value="beijing"></el-option>
+      <el-form-item label="名头" prop="renown" class="forlist">
+        <el-select v-model="deptBudgetList.renown" placeholder="请选择名头">
+          <el-option :label="item.compName" :key="item.compId" :value="item.compId"
+            v-for="(item,index) in compOptionList"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="仓位号" span="1" prop="taskNo" class="forlist">
-        <el-select v-model="deptBudgetList.region" placeholder="请选择仓位号">
-          <el-option label="区域一" value="shanghai"></el-option>
-          <el-option label="区域二" value="beijing"></el-option>
+      <el-form-item label="仓库名称" prop="warehouseName" class="forlist">
+        <el-select v-model="deptBudgetList.warehouseName" filterable placeholder="请选择仓库" @change="changeWarehouse">
+          <el-option v-for="item in warehouseList" :key='item.id' :label="item.warehouseName" :value="item.id">
+          </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="仓库地址" span="1" prop="taskNo" class="forlist">
-        <el-input disabled v-model="deptBudgetList.goodsName" placeholder="请输入仓库地址" size="small"></el-input>
-      </el-form-item>
-      <el-form-item prop="goodsName" label="货名" span="1">
-        <el-select v-model="deptBudgetList.region" placeholder="请选择货名">
-          <el-option label="区域一" value="shanghai"></el-option>
-          <el-option label="区域二" value="beijing"></el-option>
+      <el-form-item label="仓位号" prop="warehouseNo" class="forlist">
+        <el-select v-model="deptBudgetList.warehouseNo" placeholder="请选择仓位号">
+          <el-option :label="item.binNumber" :value="item.id" v-for="(item,index) in cwNumberList" :key='index'>
+          </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="goodsName" label="货名" span="1">
-        <el-select v-model="deptBudgetList.region" placeholder="请选择货名">
-          <el-option label="区域一" value="shanghai"></el-option>
-          <el-option label="区域二" value="beijing"></el-option>
+      <el-form-item label="仓库地址" prop="warehouseAddress" class="forlist">
+        <el-input disabled v-model="deptBudgetList.warehouseAddress" placeholder="请输入仓库地址" size="small"></el-input>
+      </el-form-item>
+      <el-form-item prop="goodsName" label="货名">
+        <el-select v-model="deptBudgetList.goodsName" placeholder="请选择货名">
+          <el-option v-for="item in goodsList" :key='item.id' :label="item.goodsName" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="goodsName" label="品级" span="1">
-        <el-select v-model="deptBudgetList.region" placeholder="请选择品级">
-          <el-option label="区域一" value="shanghai"></el-option>
-          <el-option label="区域二" value="beijing"></el-option>
+      <el-form-item prop="goodsName" label="品级">
+        <el-select v-model="deptBudgetList.grade" placeholder="请选择品级">
+          <el-option label="一等" value="one"></el-option>
+          <el-option label="二等" value="two"></el-option>
+          <el-option label="三等" value="three"></el-option>
+          <el-option label="等外" value="out"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="现有储量" span="1" prop="taskNo" class="forlist">
-        <el-input disabled v-model="deptBudgetList.goodsName" placeholder="请输入现有储量" size="small"></el-input>
+      <el-form-item label="现有储量" prop="nowWeight" class="forlist">
+        <el-input disabled v-model="deptBudgetList.nowWeight" placeholder="请输入现有储量" size="small"></el-input>
       </el-form-item>
-      <el-form-item label="可用储量（吨）" span="1" prop="taskNo" class="forlist">
-        <el-input disabled v-model="deptBudgetList.goodsName" placeholder="请输入可用储量" size="small"></el-input>
+      <el-form-item label="可用储量（吨）" prop="useWeight" class="forlist">
+        <el-input disabled v-model="deptBudgetList.useWeight" placeholder="请输入可用储量" size="small"></el-input>
       </el-form-item>
-      <el-form-item label="本单重量（吨）" span="1" prop="taskNo" class="forlist">
-        <el-input v-model="deptBudgetList.goodsName" placeholder="输入本次仓单申请所需的重量" size="small"></el-input>
+      <el-form-item label="本单重量（吨）" prop="weight" class="forlist">
+        <el-input v-model="deptBudgetList.weight" placeholder="输入本次仓单申请所需的重量" size="small"></el-input>
       </el-form-item>
-      <el-form-item label="单价（元/吨）" span="1" prop="taskNo" class="forlist">
-        <el-input v-model="deptBudgetList.goodsName" placeholder="输入粮食单价" size="small"></el-input>
+      <el-form-item label="单价（元/吨）" prop="unitPrice" class="forlist">
+        <el-input v-model="deptBudgetList.unitPrice" placeholder="输入粮食单价" size="small"></el-input>
       </el-form-item>
-      <el-form-item label="总价值（元）" span="1" prop="taskNo" class="forlist">
-        <el-input v-model="deptBudgetList.goodsName" placeholder="自动计算，不可编辑" size="small"></el-input>
+      <el-form-item label="总价值（元）" prop="totalValue" class="forlist">
+        <el-input v-model="deptBudgetList.totalValue" placeholder="自动计算，不可编辑" size="small"></el-input>
       </el-form-item>
-      <el-form-item label="申请比例（%）" span="1" prop="taskNo" class="forlist">
-        <el-input v-model="deptBudgetList.goodsName" placeholder="输入申请比例" size="small"></el-input>
+      <el-form-item label="申请比例（%）" prop="applicationProportion" class="forlist">
+        <el-input v-model="deptBudgetList.applicationProportion" placeholder="输入申请比例" size="small"></el-input>
       </el-form-item>
-      <el-form-item label="申请金额（元）" span="1" prop="taskNo" class="forlist">
-        <el-input v-model="deptBudgetList.goodsName" placeholder="输入申请金额" size="small"></el-input>
+      <el-form-item label="申请金额（元）" prop="interest" class="forlist">
+        <el-input v-model="deptBudgetList.interest" placeholder="输入申请金额" size="small"></el-input>
       </el-form-item>
       <div>附件</div>
-      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
+      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.appendix" :size-limit="size"
         @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
       <div>外审部门</div>
-      <el-form-item prop="goodsName" label="银行" span="1">
-        <el-select v-model="deptBudgetList.region" placeholder="请选择银行">
-          <el-option label="区域一" value="shanghai"></el-option>
-          <el-option label="区域二" value="beijing"></el-option>
+      <el-form-item prop="bank" label="银行">
+        <el-select v-model="deptBudgetList.bank" placeholder="请选择银行">
+          <el-option label="中国银行" value="bank"></el-option>
+          <el-option label="营口银行" value="bank"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="第三方" span="1" prop="taskNo" class="forlist">
-        <el-input v-model="deptBudgetList.goodsName" placeholder="无" size="small"></el-input>
+      <el-form-item label="第三方" span="1" prop="three" class="forlist">
+        <el-select v-model="deptBudgetList.three" placeholder="请选择银行">
+          <el-option label="第三方1" value="bank"></el-option>
+          <el-option label="第三方2" value="bank"></el-option>
+        </el-select>
       </el-form-item>
       <div>
         <el-button @click='inoutput' type="primary">出入库记录</el-button>
@@ -91,8 +104,15 @@
 </template>
 <script>
   import {
-    getList,
+    getcompList,
+  } from '@/model/signIn/index'
+  import {
+    addList,
+    getbillno
   } from '@/model/tradeServicesManagement/index'
+  import {
+    selectWarehouseSelf,
+  } from '@/model/houseSelfCollect/index'
   import WsUpload from '@/components/WsUpload'
   export default {
     components: {
@@ -100,40 +120,176 @@
     },
     data() {
       return {
-        deptBudgetList: {},
+        deptBudgetList: {
+          warehouseName: '',
+          warehouseNo: '',
+          compId:sessionStorage.getItem('ws-pf_compId')
+        },
         size: 10,
         compId: sessionStorage.getItem('ws-pf_compId'),
+        warehouseList: [],
+        compOptionList: [],
+        cwNumberList: [],
+        goodsList: [],
+        rules: {
+          // name: [
+          //   { required: true, message: '请输入活动名称', trigger: 'blur' },
+          //   { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' }
+          // ],
+        }
       }
     },
     activated() {
-
+      this.getList()
     },
     methods: {
+      getList() {
+        this.deptBudgetList.grade = '二等'
+        // 获取业务编号
+        getbillno().toPromise().then((response) => {
+          this.deptBudgetList.billNo = response
+        })
+        //获取仓库
+        selectWarehouseSelf({
+            compId: this.compId
+          }).toPromise()
+          .then(response => {
+            console.log('仓库信息', response)
+            this.warehouseList = response
+            this.deptBudgetList.warehouseName = response[0].warehouseName
+            this.cwNumberList = response[0].positionInfos
+            this.deptBudgetList.warehouseNo = response[0].positionInfos[0].binNumber
+            this.deptBudgetList.warehouseAddress = response[0].warehousePrivate + response[0].warehouseCity +
+              response[0].warehouseArea + response[0].detailedAddress
+            this.goodsList = response[0].goodsNameInfos
+            this.deptBudgetList.nowWeight = response[0].goodsNameInfos[0].storage
+            // this.deptBudgetList.useWeight = response[0].goodsNameInfos[0].useWeight
+            this.deptBudgetList.useWeight = '10'
+            this.deptBudgetList.goodsName = response[0].goodsNameInfos[0].goodsName
+          })
+        //获取公司名头
+        getcompList()
+          .toPromise()
+          .then((res) => {
+            console.log('公司下拉列表数据', res)
+            this.compOptionList = res
+            this.deptBudgetList.renown = res[0].compName
+          })
+          .catch((err) => {})
+      },
+      //仓库切换
+      changeWarehouse(val) {debugger
+        console.log('切换后仓库数据', val)
+        let _data = this.warehouseList
+        for (let i = 0; i < _data.length; i++) {
+          if (_data[i].id == val) {
+            this.deptBudgetList.warehouseName = _data[i].warehouseName
+            this.cwNumberList =_data[i].positionInfos.length!=0?_data[i].positionInfos:[]
+            this.deptBudgetList.warehouseNo = _data[i].positionInfos.length!=0?_data[i].positionInfos[0].binNumber:''
+            this.deptBudgetList.warehouseAddress = _data[i].warehousePrivate + _data[i].warehouseCity +
+              _data[i].warehouseArea + _data[i].detailedAddress
+            this.goodsList =_data[i].goodsNameInfos.length!=0?_data[i].goodsNameInfos:[]
+            this.deptBudgetList.nowWeight =_data[i].goodsNameInfos.length!=0?_data[i].goodsNameInfos[0].storage:''
+            // this.deptBudgetList.useWeight =_data[i].goodsNameInfos.length!=0?_data[i].goodsNameInfos[0].useWeight:''
+            this.deptBudgetList.useWeight ='10'
+            this.deptBudgetList.goodsName = _data[i].goodsNameInfos.length!=0?_data[i].goodsNameInfos[0].goodsName:''
+          }
+        }
+      },
       inoutput() {
         this.$router.push({
           name: 'inOutRecord'
         })
       },
       submit() {
-
+        this.$confirm(`确定提交审核？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {debugger
+          addList(this.deptBudgetList).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
+            this.deptBudgetList.appendix = response
           })
           .catch(res => {
             EventBus.$emit('error', (JSON.parse(res) || {}).message)
             this.$refs.upload.clearFiles()
           })
       },
+      cancel() {
+        this.$router.push({
+          path: 'warehouseReceiptRegulation'
+        })
+      },
     },
   }
 </script>
 <style lang="scss" scoped>
+  /deep/.el-form-item__content {
+    width: 400px;
+  }
+
+  /deep/.el-select {
+    width: 100%;
+  }
+
   .el-form {
     overflow: scroll;
     height: 94vh;
   }
+
+  .bg-left {
+    padding-left: 30px;
+  }
+
+  .bg-bottom {
+    margin: 15px 0px;
+  }
+
+  .titleup {
+    position: relative;
+  }
+
+  .titleup::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+
+  .bg-right {
+    padding-right: 10px;
+    text-align: right;
+  }
+
+  .center {
+    background: #f6f7fc;
+  }
+
+  .content2 {
+    background: white;
+    // padding:0 200px;
+    // text-align: center;
+    padding-left: 40px;
+  }
+
+  .title1 {
+    font-size: 20px;
+    font-weight: 600;
+    margin: 20px 0;
+  }
 </style>

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

src/views/tradeServicesManagement/warehouseReceiptRegulation.vue

@@ -86,7 +86,8 @@
 <script>
   import mapDrag from '@/components/mapdrag/warehouseReceiptMap'
   import {
-    getList
+    getList,
+    getMapInfo
   } from '@/model/tradeServicesManagement/index'
   import {
     selectWarehouseSelf,
@@ -102,13 +103,14 @@
         isActive: false,
         radio: '1',
         tradeServicesList: [],
+        mapInfo: [],
         currentPage: 1,
         pageSize: 10,
         deptBudgetTotal: 0,
         deptCircularPage: {},
         searchType: '0',
         warehouseList: [],
-        compId:'',
+        compId: '',
       }
     },
     activated() {},
@@ -131,15 +133,20 @@
       }
       this.compId = sessionStorage.getItem('ws-pf_compId')
       this.getList()
+      this.getMapInfo()
       // this.getWarehouseList()
-      this.tradeServicesList = [{
-        authenticationStatus: 'test'
-      }]
+      this.tradeServicesList = []
     },
     methods: {
+      getMapInfo() {
+        getMapInfo().toPromise().then((response) => {
+          console.log('地图数据', response)
+          // this.mapInfo = response.data.records
+        })
+      },
       findList() {
-        this.currentPage=1
-        this.pageSize=10
+        this.currentPage = 1
+        this.pageSize = 10
         this.getList()
       },
       handlestatus(status) {
@@ -231,10 +238,12 @@
 </script>
 <style lang="scss" scoped>
   .container {}
-  .icon{
+
+  .icon {
     transform: rotate(90deg);
     margin: 0 10px;
   }
+
   .active {
     height: 0 !important;
     overflow: hidden;