1

src/views/contractManagement/purchaseContractAdd.vue

@@ -89,6 +89,7 @@
         <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
           <el-radio v-model="deptBudgetList.deliverType" label="1">我方自提</el-radio>
           <el-radio v-model="deptBudgetList.deliverType" label="2">对方送货</el-radio>
+          <el-radio v-model="deptBudgetList.deliverType" label="3">对方送货(临时库)</el-radio>
           <!-- <el-radio v-model="deptBudgetList.deliverType" v-if="deptBudgetList.priceType == '随行就市'" disabled label="1">
               我方自提</el-radio>
             <el-radio v-model="deptBudgetList.deliverType" v-else label="1">我方自提</el-radio>
@@ -269,7 +270,7 @@
           <el-radio v-model="deptBudgetList.settlementWeightMethod" label="1">按出库重量结算</el-radio>
           <el-radio v-model="deptBudgetList.settlementWeightMethod" label="2">按入库重量结算</el-radio>
         </ws-form-item>
-        <ws-form-item v-show="deptBudgetList.deliverType == 1" label="临时仓库负责人" span="1" prop="packingMethod">
+        <ws-form-item v-show="deptBudgetList.deliverType != 2" label="临时仓库负责人" span="1" prop="packingMethod">
           <el-select v-model="deptBudgetList.personPhone" multiple placeholder="请选择临时仓库负责人" filterable clearable
             @change="selectstaff">
             <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffMobilePhone" />
@@ -969,11 +970,11 @@ import { isUndefined } from 'xe-utils/methods'
           return
         }
         if (
-          this.deptBudgetList.contractNo.length < 6 ||
+          this.deptBudgetList.contractNo.length < 5 ||
           this.deptBudgetList.contractNo.length > 50
         ) {
           this.$message({
-            message: '合同编号长度不符合要求,请输入6到50个字符之内！',
+            message: '合同编号长度不符合要求,请输入5到50个字符之内！',
             type: 'warning',
           })
           return
@@ -1285,124 +1286,124 @@ import { isUndefined } from 'xe-utils/methods'
           })
           return
         }
-        if (!this.deptBudgetList.contractGoodsInfo.impurity) {
-          this.$message({
-            message: '请输入杂质',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          this.deptBudgetList.contractGoodsInfo.impurity &&
-          String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
-          String(this.deptBudgetList.contractGoodsInfo.impurity).length -
-          (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') + 1) >
-          2 || this.deptBudgetList.contractGoodsInfo.impurity > 40 || this.deptBudgetList.contractGoodsInfo.impurity < 0
-        ) {
-          this.$message({
-            message: '杂质输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.contractGoodsInfo.bulkDensity) {
-          this.$message({
-            message: '请输入容重',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          (this.deptBudgetList.contractGoodsInfo.bulkDensity &&
-            String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
-            String(this.deptBudgetList.contractGoodsInfo.bulkDensity).length -
-            (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') + 1) >
-            2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo
-          .bulkDensity < 0
-        ) {
-          this.$message({
-            message: '容重输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.contractGoodsInfo.mildewGrain) {
-          this.$message({
-            message: '请输入霉变粒',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          !this.deptBudgetList.contractGoodsInfo.mildewGrain ||
-          (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractGoodsInfo.mildewGrain).length -
-            (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
-                '.'
-              ) +
-              1) >
-            2 || this.deptBudgetList.contractGoodsInfo.mildewGrain > 40 || this.deptBudgetList.contractGoodsInfo
-            .mildewGrain < 0)
-        ) {
-          this.$message({
-            message: '霉变粒输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.contractGoodsInfo.jiaorenli) {
-          this.$message({
-            message: '请输入热损伤',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          !this.deptBudgetList.contractGoodsInfo.jiaorenli ||
-          (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') !=
-            -1 &&
-            String(this.deptBudgetList.contractGoodsInfo.jiaorenli).length -
-            (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf(
-                '.'
-              ) +
-              1) >
-            2 || this.deptBudgetList.contractGoodsInfo.jiaorenli > 40 || this.deptBudgetList.contractGoodsInfo
-            .jiaorenli < 0)
-        ) {
-          this.$message({
-            message: '热损伤输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (!this.deptBudgetList.contractGoodsInfo.imperfectGrain) {
-          this.$message({
-            message: '请输入不完善粒',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          !this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
-          (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf(
-              '.'
-            ) != -1 &&
-            String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).length -
-            (String(
-                this.deptBudgetList.contractGoodsInfo.imperfectGrain
-              ).indexOf('.') +
-              1) >
-            2 || this.deptBudgetList.contractGoodsInfo.imperfectGrain > 40 || this.deptBudgetList.contractGoodsInfo
-            .imperfectGrain < 0)
-        ) {
-          this.$message({
-            message: '不完善粒输入错误',
-            type: 'warning',
-          })
-          return
-        }
+        // if (!this.deptBudgetList.contractGoodsInfo.impurity) {
+        //   this.$message({
+        //     message: '请输入杂质',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   this.deptBudgetList.contractGoodsInfo.impurity &&
+        //   String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') != -1 &&
+        //   String(this.deptBudgetList.contractGoodsInfo.impurity).length -
+        //   (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') + 1) >
+        //   2 || this.deptBudgetList.contractGoodsInfo.impurity > 40 || this.deptBudgetList.contractGoodsInfo.impurity < 0
+        // ) {
+        //   this.$message({
+        //     message: '杂质输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (!this.deptBudgetList.contractGoodsInfo.bulkDensity) {
+        //   this.$message({
+        //     message: '请输入容重',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   (this.deptBudgetList.contractGoodsInfo.bulkDensity &&
+        //     String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') != -1 &&
+        //     String(this.deptBudgetList.contractGoodsInfo.bulkDensity).length -
+        //     (String(this.deptBudgetList.contractGoodsInfo.bulkDensity).indexOf('.') + 1) >
+        //     2) || this.deptBudgetList.contractGoodsInfo.bulkDensity > 1000 || this.deptBudgetList.contractGoodsInfo
+        //   .bulkDensity < 0
+        // ) {
+        //   this.$message({
+        //     message: '容重输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (!this.deptBudgetList.contractGoodsInfo.mildewGrain) {
+        //   this.$message({
+        //     message: '请输入霉变粒',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   !this.deptBudgetList.contractGoodsInfo.mildewGrain ||
+        //   (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
+        //       '.'
+        //     ) != -1 &&
+        //     String(this.deptBudgetList.contractGoodsInfo.mildewGrain).length -
+        //     (String(this.deptBudgetList.contractGoodsInfo.mildewGrain).indexOf(
+        //         '.'
+        //       ) +
+        //       1) >
+        //     2 || this.deptBudgetList.contractGoodsInfo.mildewGrain > 40 || this.deptBudgetList.contractGoodsInfo
+        //     .mildewGrain < 0)
+        // ) {
+        //   this.$message({
+        //     message: '霉变粒输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (!this.deptBudgetList.contractGoodsInfo.jiaorenli) {
+        //   this.$message({
+        //     message: '请输入热损伤',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   !this.deptBudgetList.contractGoodsInfo.jiaorenli ||
+        //   (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf('.') !=
+        //     -1 &&
+        //     String(this.deptBudgetList.contractGoodsInfo.jiaorenli).length -
+        //     (String(this.deptBudgetList.contractGoodsInfo.jiaorenli).indexOf(
+        //         '.'
+        //       ) +
+        //       1) >
+        //     2 || this.deptBudgetList.contractGoodsInfo.jiaorenli > 40 || this.deptBudgetList.contractGoodsInfo
+        //     .jiaorenli < 0)
+        // ) {
+        //   this.$message({
+        //     message: '热损伤输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (!this.deptBudgetList.contractGoodsInfo.imperfectGrain) {
+        //   this.$message({
+        //     message: '请输入不完善粒',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   !this.deptBudgetList.contractGoodsInfo.imperfectGrain ||
+        //   (String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).indexOf(
+        //       '.'
+        //     ) != -1 &&
+        //     String(this.deptBudgetList.contractGoodsInfo.imperfectGrain).length -
+        //     (String(
+        //         this.deptBudgetList.contractGoodsInfo.imperfectGrain
+        //       ).indexOf('.') +
+        //       1) >
+        //     2 || this.deptBudgetList.contractGoodsInfo.imperfectGrain > 40 || this.deptBudgetList.contractGoodsInfo
+        //     .imperfectGrain < 0)
+        // ) {
+        //   this.$message({
+        //     message: '不完善粒输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         // if (
         //   (!this.deptBudgetList.contractProcessInfo.goodsNameKey > 1000000000) ||
         //     (this.deptBudgetList.contractProcessInfo.goodsNameKey < 100) ||

src/views/contractManagement/purchaseContractEdit.vue

@@ -196,12 +196,12 @@
         </ws-form-item>
 
         <!-- 临时仓库负责人 -->
-        <ws-form-item label="临时仓库负责人" span="1" prop="packingMethod" v-if="deptBudgetList.deliverType == 1">
+        <ws-form-item label="临时仓库负责人" span="1" prop="packingMethod" v-if="deptBudgetList.deliverType != 2">
           <el-select v-model="deptBudgetList.personCharge" placeholder="请选择临时仓库负责人" filterable clearable @change="selectstaff">
             <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
           </el-select>
         </ws-form-item>
-        <ws-form-item class="readonly" label="结算重量方式" span="1" prop="settlementWeightMethod">
+        <ws-form-item class="readonly" label="结算重量方式" span="1" prop="settlementWeightMethod" v-if="deptBudgetList.deliverType==1">
           {{ deptBudgetList.settlementWeightMethod==1?'按出库重量结算':'按入库重量结算' }}
         </ws-form-item>
       </ws-info-table>
@@ -518,6 +518,8 @@
               this.deptBudgetList.deliverType1 = '我方自提'
             } else if (this.deptBudgetList.deliverType == 2) {
               this.deptBudgetList.deliverType1 = '对方送货'
+            }else if (this.deptBudgetList.deliverType == 3) {
+              this.deptBudgetList.deliverType1 = '对方送货(临时库)'
             }
 
           })

src/views/contractManagement/purchaseContractExamine.vue

@@ -126,10 +126,10 @@
         <ws-form-item label="最终实际交易量(吨)" span="1" prop="finalTradingVolume">
           {{ deptBudgetList.finalTradingVolume }}
         </ws-form-item>
-        <ws-form-item label="临时仓库负责人" span="1" prop="personCharge" v-if="deptBudgetList.deliverType == 1">
+        <ws-form-item label="临时仓库负责人" span="1" prop="personCharge" v-if="deptBudgetList.deliverType != 2">
           {{ deptBudgetList.personCharge }}
         </ws-form-item>
-        <ws-form-item class="readonly" label="结算重量方式" span="1" prop="settlementWeightMethod">
+        <ws-form-item class="readonly" label="结算重量方式" span="1" prop="settlementWeightMethod" v-if="deptBudgetList.deliverType==1">
           {{ deptBudgetList.settlementWeightMethod==1?'按出库重量结算':'按入库重量结算' }}
         </ws-form-item>
       </ws-info-table>
@@ -294,6 +294,9 @@
             } else if (this.deptBudgetList.deliverType == 2) {
               this.deptBudgetList.deliverType1 = '对方送货'
             }
+            else if (this.deptBudgetList.deliverType == 3) {
+              this.deptBudgetList.deliverType1 = '对方送货(临时库)'
+            }
           })
         // 包装方式
         packList({

src/views/outboundManagement/weighingManagementNew.vue

@@ -944,7 +944,7 @@
             })
             return
           }
-          if (!this.weighingList.binNumber) {
+          if (!this.weighingList.binNumber && this.weighingList.warehouseType == 1) {
             this.$message({
               message: '仓位号不能为空',
               type: 'warning',
@@ -997,7 +997,7 @@
             return
           }
         }
-        if (!this.weighingList.binNumber) {
+        if (!this.weighingList.binNumber&& this.weighingList.warehouseType == 1) {
           this.$message({
             message: '仓位号不能为空',
             type: 'warning',

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -85,10 +85,10 @@
             </el-col>
           </el-row>
           <div class="small-title" style="font-size: 16px">派车
-            <!-- <el-radio-group @change='pricetypechange' v-model="pricetype">
+            <el-radio-group @change='pricetypechange' v-model="pricetype">
               <el-radio label="1">元/吨计费</el-radio>
               <el-radio label="2">元/车计费</el-radio>
-            </el-radio-group> -->
+            </el-radio-group>
             </div>
           
           <div class="myTest">

src/views/warehousenew/warehouseManagementList.vue

@@ -1057,17 +1057,19 @@
             }
             this.initCharts()
             this.warehouseList = response.warehouseViewList
-            this.warehouseInfo = this.warehouseList[0]
-            this.warehouseInfo.warehouseLocation = this.warehouseList[0].warehousePrivate + this.warehouseList[0].warehouseCity + this.warehouseList[0].warehouseArea
-            // this.warehouseInfo.maxReserves = 0
-            //经纬度
-             this.warehousePositioning.lat = this.warehouseInfo.warehousePositioning.split(',')[1]
-             this.warehousePositioning.lng = this.warehouseInfo.warehousePositioning.split(',')[0]
-             for(let j = 0 ; j < this.warehouseXiaLa.length ; j++){
+            if(this.warehouseList.length>0){
+              this.warehouseInfo = this.warehouseList[0]
+              this.warehouseInfo.warehouseLocation = this.warehouseList[0].warehousePrivate + this.warehouseList[0].warehouseCity + this.warehouseList[0].warehouseArea
+              // this.warehouseInfo.maxReserves = 0
+              //经纬度
+              this.warehousePositioning.lat = this.warehouseInfo.warehousePositioning.split(',')[1]
+              this.warehousePositioning.lng = this.warehouseInfo.warehousePositioning.split(',')[0]
+              for(let j = 0 ; j < this.warehouseXiaLa.length ; j++){
                 if(this.warehouseInfo.warehouseName == this.warehouseXiaLa[j].warehouseName){
                   this.warehouseInfo.maxReserves = this.warehouseXiaLa[j].totalStorage
-                 }
+                  }
               }
+            }
           })
       }
     },

src/views/warehousenew/warehouseManagementLook.vue

@@ -82,6 +82,15 @@
           >
             {{ deptBudgetList.detailedAddress }}
           </ws-form-item>
+          <!--仓库编号-->
+          <ws-form-item
+            label="仓库编号"
+            span="1"
+            prop="commonWarehouseNo"
+            class="readonly"
+          >
+            {{ deptBudgetList.commonWarehouseNo }}
+          </ws-form-item>
           <!--总储量（吨)-->
           <ws-form-item
             v-show="warehouseType == '1'"

src/views/warehousenew/warehousingOrder.vue

@@ -82,9 +82,10 @@
         </el-table-column>
         <el-table-column prop="goodsSource" label="货源" width="80"></el-table-column>
         <el-table-column prop="deliveryWarehouse" label="发货库" width="80"></el-table-column>
-        <el-table-column prop="goodsName" label="货名" width="80">
+        <el-table-column prop="customer" label="客户" width="100"></el-table-column>
+        <el-table-column prop="goodsName" label="货名" width="60">
         </el-table-column>
-        <el-table-column prop="inWarehouseWeight1"  width="200" class="table_td" label="入库重量（吨）">
+        <el-table-column prop="inWarehouseWeight1"  width="140" class="table_td" label="入库重量（吨）">
           <template scope="scope">
             <span v-if='scope.row.weightedit==false&&scope.row.warehouseType==2||scope.row.warehouseType==1'>{{scope.row.inWarehouseWeight1}}</span>
             <el-input style='width:80%;' v-if='scope.row.weightedit&&scope.row.warehouseType==2' v-model='scope.row.inWarehouseWeight1'></el-input>
@@ -94,11 +95,11 @@
               src="../../../public/img/edit.png" @click="editWeight(scope.row)" alt="" />
           </template>
         </el-table-column>
-        <el-table-column prop="outWarehouseWeight"  width="130" class="table_td" label="出库重量（吨）"></el-table-column>
+        <el-table-column prop="outWarehouseWeight"  width="110" class="table_td" label="出库重量（吨）"></el-table-column>
         <el-table-column prop="profitAndLoss" class="table_td" label="盈亏（吨）"></el-table-column>
-        <el-table-column prop="surplusWeight" width="130" class="table_td" label="剩余重量（吨）"></el-table-column>
-        <el-table-column prop="grainFund"  width="130" class="table_td" label="粮款（元）"></el-table-column>
-        <el-table-column prop="amountEdPayable"  width="130" class="table_td" label="已付（元）">
+        <el-table-column prop="surplusWeight" width="110" class="table_td" label="剩余重量（吨）"></el-table-column>
+        <el-table-column prop="grainFund"  width="100" class="table_td" label="粮款（元）"></el-table-column>
+        <el-table-column prop="amountEdPayable"  width="100" class="table_td" label="已付（元）">
           <template scope="scope">
             <span >{{scope.row.amountEdPayable}}</span>
             <img v-if='scope.row.addressUrl' width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
@@ -106,17 +107,25 @@
           </template>
         </el-table-column>
         <el-table-column prop="amountNotPayable" class="table_td" label="未付（元）"></el-table-column>
-        <el-table-column prop="amountMoney" width="130" class="table_td" label="费用（元）">
+        <el-table-column prop="amountMoney" width="80" class="table_td" label="费用（元）">
           <template scope="scope">
             <span @click='costclick(scope.row)'>{{scope.row.amountMoney}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="avgCost"  width="130" class="table_td" label="平均成本（元/吨）"></el-table-column>
-        <el-table-column prop="requestFunds"  width="180" class="table_td" label="请款">
+        <el-table-column prop="requestFunds"  width="130" class="table_td" label="请款">
           <template scope="scope">
             <span v-if="!scope.row.select">{{ scope.row.requestFunds }}</span>
             <el-input v-else v-model='scope.row.requestFunds'></el-input>
           </template>
+        </el-table-column>
+         <el-table-column prop="remark"  width="130" class="table_td" label="请款备注">
+          <template scope="scope">
+            <div v-if="!scope.row.select" @click.stop="lookRemark(scope.row)">
+              <span class="text_css">查看</span>
+            </div>
+            <el-input v-else v-model='scope.row.remark'></el-input>
+          </template>
         </el-table-column>
         <el-table-column prop="approveStatus" label="请款状态" width="90">
           <template slot-scope="scope">
@@ -152,25 +161,28 @@
         </span>
       </el-dialog>
       <!-- <el-dialog
-  title="提示"
-  :visible.sync="dialogVisible"
-  width="30%"
-  :before-close="handleClose">
-  <div> 
-    <el-time-picker
-    v-model="value1"
-      format='HH:mm'
-    value-format="HH:mm"
+      title="提示"
+      :visible.sync="dialogVisible"
+      width="30%"
+      :before-close="handleClose">
+      <div> 
+        <el-time-picker
+        v-model="value1"
+          format='HH:mm'
+        value-format="HH:mm"
 
-    
-    placeholder="任意时间点"> </el-time-picker>
-    <ws-button type="primary" @click="handleAdd()" v-hasPermission="
-            `warehouseManagement.warehouse.warehouseInfoTask.add`
-          ">修改
-        </ws-button>
-  </div>
-</el-dialog> -->
-<el-dialog width='50%' :visible.sync="accessoryTFs" title="附件" top="20vh">
+        
+        placeholder="任意时间点"> </el-time-picker>
+        <ws-button type="primary" @click="handleAdd()" v-hasPermission="
+                `warehouseManagement.warehouse.warehouseInfoTask.add`
+              ">修改
+            </ws-button>
+      </div>
+    </el-dialog> -->
+    <el-dialog width='30%' :visible.sync="remarkList" title="备注" top="20vh">
+      <span>{{remark}}</span>
+    </el-dialog>
+    <el-dialog width='50%' :visible.sync="accessoryTFs" title="附件" top="20vh">
       <div v-for="(item,index) in appendixIdss" :key="'fujian'+index" >
        <el-image 
         style="width: 100px; height: 100px"
@@ -179,7 +191,7 @@
       </el-image>
       </div>
     </el-dialog>
-  <el-dialog width='30%' :visible.sync="dialogVisible1" title="费用" top="20vh">
+    <el-dialog width='30%' :visible.sync="dialogVisible1" title="费用" top="20vh">
       <div v-for="(item,index) in costlist" :key="index" class="audit">
         <div class="audit_item">
           <div class="audit_left">
@@ -195,7 +207,7 @@
         </div>
       </div>
     </el-dialog>
-</div>
+  </div>
   </div>
 </template>
 <script>
@@ -337,6 +349,8 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           },
         },
         accessoryTFs: false,
+        remarkList: false,
+        remark:''
       }
     },
     // activated() {
@@ -364,6 +378,18 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
         
         console.log(this.appendixIdss)
       },
+      lookRemark(row) {
+        if(row.remark){
+        this.remark = row.remark
+        this.remarkList = true
+        }
+        else{
+          this.$message({
+              message: '暂无请款备注',
+              type: 'warning'
+            });
+        }
+      },
       handle(status){
         this.searchType=status
         this.getList()
@@ -406,7 +432,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             type: 'warning',
           })
           .then(() => {
-            editwarehousingorder({id:row.id,inWarehouseWeight:row.inWarehouseWeight1*1000}).toPromise()
+            editwarehousingorder({id:row.id,inWarehouseWeight:row.inWarehouseWeight1}).toPromise()
               .then((response) => {
                 // row.weightedit=false
                 this.getList()
@@ -414,7 +440,7 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           })
       },
       payout(item){
-        // console.log(item)
+        console.log(item)
         if(localStorage.getItem('ws-pf_roleName')=='销售内勤'||localStorage.getItem('ws-pf_roleName')=='采购内勤'){
           if(this.multipleSelection1[item.id].length>0){
             item.payshow=false
@@ -561,7 +587,6 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
           })
       },
       paymentsubmit(item){
-        // console.log(item.id)
         var that=this
         console.log(this.multipleSelection1,this.multipleSelection1[this.currectdata.id])
         var arr2=this.multipleSelection1[this.currectdata.id]
@@ -572,9 +597,13 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
             });
             return
           }
-          console.log(arr2)
           for (let i = 0; i < arr2.length; i++) {
-            arr2[i].addressUrlArray=arr2[i].addressUrlArray.concat(this.paymentScreenshot)
+            if(arr2[i].addressUrlArray){
+              arr2[i].addressUrlArray=arr2[i].addressUrlArray.concat(this.paymentScreenshot)
+            }
+            else{
+              arr2[i].addressUrlArray=this.paymentScreenshot
+            }
             arr2[i].addressUrl=arr2[i].addressUrlArray.toString()
             
           }