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

src/api/V2/outboundManagement/index.js

@@ -9,18 +9,30 @@ export const API_GET_WAREHOUSESELF = '/warehouseBaseInfo/selectWarehouseSelf'
 //检斤列表查看
 export const API_GET_WEIGHTCHECK_GETWEIGHINGLIST = '/weighingManagement/selectWeighingManagement'
 //皮重检斤保存
-export const API_POST_WEIGHTCHECK_TARE= '/weighingManagement/api/editTare'
+export const API_POST_WEIGHTCHECK_TARE = '/weighingManagement/api/editTare'
 //出库管理添加皮重检斤
-export const API_POST_WEIGHTCHECK_ADDTARE= '/weighingManagement/api/addTare'
+export const API_POST_WEIGHTCHECK_ADDTARE = '/weighingManagement/api/addTare'
 //出库管理编辑皮重检斤
-export const API_POST_WEIGHTCHECK_EDITTAREOUT= '/weighingManagement/api/editTareOut'
+export const API_POST_WEIGHTCHECK_EDITTAREOUT = '/weighingManagement/api/editTareOut'
 //毛重检斤保存
 export const API_POST_WEIGHTCHECK_GROSSWEIGHT = '/weighingManagement/api/editGrossWeight'
 //检斤仓位下拉
 export const API_GET_INSPECT_GETBINNUMBER = '/warehouseBaseInfo/getWarehouse'
 //删除检斤信息
 export const API_POST_INSPECT_DELETEWEIGHING = '/weighingManagement/api/deleteWeightcheck'
-//合同编号下拉
-export const API_GET_INSPECT_CONTRANCLIST= '/warehouseBaseInfo/selectContractNoList'
+//收款合同编号下拉
+export const API_GET_INSPECT_CONTRANCLIST = '/paymentManagement/selectContractNoList'
+//检斤合同编号下拉
+export const API_GET_INSPECT_CONTRANCLISTWEIGHING = '/warehouseBaseInfo/selectContractNoList'
 //检斤查看
 export const API_GET_WEIGHTCHECK = '/weighingManagement/getWeighingManagement'
+//收款管理列表
+export const API_GET_COLLECTION_LIST = '/paymentManagement/selectPaymentManagement'
+//收款查看
+export const API_GET_COLLECTION = '/paymentManagement/getInfo'
+// 收款
+export const API_POST_COLLECTION_MONEY = '/paymentManagement/api/collectMoney'
+// 编辑实际应收
+export const API_POST_COLLECTION_EDITCOLLECT = '/paymentManagement/api/editCollect'
+// 添加备注
+export const API_POST_COLLECTION_ADDREMARKS = '/paymentManagement/api/addRemarks'

src/model/outboundManagement/index.js

@@ -14,7 +14,13 @@ import {
     API_GET_INSPECT_CONTRANCLIST,
     API_POST_WEIGHTCHECK_ADDTARE,
     API_POST_WEIGHTCHECK_EDITTAREOUT,
-    API_GET_WEIGHTCHECK
+    API_GET_WEIGHTCHECK,
+    API_GET_COLLECTION,
+    API_GET_COLLECTION_LIST,
+    API_POST_COLLECTION_EDITCOLLECT,
+    API_POST_COLLECTION_ADDREMARKS,
+    API_POST_COLLECTION_MONEY,
+    API_GET_INSPECT_CONTRANCLISTWEIGHING
 
 }   from '@/api/V2/outboundManagement'
 
@@ -40,8 +46,19 @@ export const tareEdit = appRx.post(API_POST_WEIGHTCHECK_EDITTAREOUT, errorCatche
 export const getbinNumber = appRx.get(API_GET_INSPECT_GETBINNUMBER, errorCatcher, errorHandle, filter)
 //删除检斤信息
 export const delelteWeighing = appRx.post(API_POST_INSPECT_DELETEWEIGHING, errorCatcher, errorHandle, filter)
-//合同编号下拉
+//收款合同编号下拉
 export const contractList = appRx.get(API_GET_INSPECT_CONTRANCLIST, errorCatcher, errorHandle, filter)
+//检斤合同编号下拉
+export const contractListWeighing = appRx.get(API_GET_INSPECT_CONTRANCLISTWEIGHING, errorCatcher, errorHandle, filter)
 //检斤查看
 export const getweighing = appRx.get(API_GET_WEIGHTCHECK, errorCatcher, errorHandle, filter)
-  
+//收款信息查看
+export const getcollectionexamine = appRx.get(API_GET_COLLECTION, errorCatcher, errorHandle, filter)
+//收款
+export const moneyCollection = appRx.post(API_POST_COLLECTION_MONEY, errorCatcher, errorHandle, filter)
+//收款管理列表
+export const getcollection = appRx.get(API_GET_COLLECTION_LIST, errorCatcher, errorHandle, filter)
+//编辑实际应收
+export const editcollect = appRx.post(API_POST_COLLECTION_EDITCOLLECT, errorCatcher, errorHandle, filter)
+//添加备注
+export const remarksAdd = appRx.post(API_POST_COLLECTION_ADDREMARKS, errorCatcher, errorHandle, filter)

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -170,7 +170,6 @@
       getWarehouseSelf() {
         selectWarehouseSelf({
           compId: this.compId,
-          personCharge: this.accountName,
         }).toPromise().then((response) => {
           console.log(response)
           this.warehouseList = response

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -54,15 +54,15 @@
           </div>
 
           <ws-form-item label="姓名" span="1" prop="customerName" label-width="80px">
-            <ws-input v-model="customerList.customerName" placeholder="请输入姓名" maxlength="100" size="small"
+            <ws-input v-model="customerList.customerName" placeholder="请输入姓名" maxlength="15" size="small"
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="身份证号" span="1" prop="customerNumberCard">
-            <ws-input v-model="customerList.customerNumberCard" placeholder="请输入身份证号" maxlength="100" size="small"
+            <ws-input v-model="customerList.customerNumberCard" placeholder="请输入身份证号" maxlength="18" size="small"
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="银行卡号" span="1" prop="bankCard">
-            <ws-input v-model="customerList.bankCard" placeholder="请输入银行卡号" maxlength="100" size="small"
+            <ws-input v-model="customerList.bankCard" placeholder="请输入银行卡号" maxlength="19" size="small"
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="开户行" span="1" prop="bankDeposit">
@@ -74,15 +74,15 @@
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="收款人姓名" span="1" prop="payeeName">
-            <ws-input v-model="customerList.payeeName" placeholder="请输入收款人姓名" maxlength="100" size="small"
+            <ws-input v-model="customerList.payeeName" placeholder="请输入收款人姓名" maxlength="15" size="small"
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="收款人身份证号" span="1" prop="payeeNumberCard">
-            <ws-input v-model="customerList.payeeNumberCard" placeholder="请输入收款人身份证号" maxlength="100" size="small"
+            <ws-input v-model="customerList.payeeNumberCard" placeholder="请输入收款人身份证号" maxlength="18" size="small"
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="手机号" span="1" prop="customerPhone">
-            <ws-input v-model="customerList.customerPhone" placeholder="请输入手机号" maxlength="100" size="small"
+            <ws-input v-model="customerList.customerPhone" placeholder="请输入手机号" maxlength="11" size="small"
               :disabled="disabled" />
           </ws-form-item>
           <ws-form-item label="联系地址" span="1" prop="compAddress">
@@ -357,8 +357,76 @@
           })
           return
         }
-
-
+        if (!this.customerList.customerName) {
+          this.$message({
+            message: '请输入姓名',
+            type: 'warning',
+          })
+          return
+        }
+           if (!this.customerList.customerNumberCard) {
+          this.$message({
+            message: '请输入输入银行卡号',
+            type: 'warning',
+          })
+          return
+        }
+           if (!this.customerList.bankDeposit) {
+          this.$message({
+            message: '请输入开户行',
+            type: 'warning',
+          })
+          return
+        }
+          if (!this.customerList.bankDepositBranch) {
+          this.$message({
+            message: '请输入开户支行',
+            type: 'warning',
+          })
+          return
+        }
+         if (!this.customerList.payeeName) {
+          this.$message({
+            message: '请输入收款人姓名',
+            type: 'warning',
+          })
+          return
+        } 
+         if (!this.customerList.payeeNumberCard) {
+          this.$message({
+            message: '请输入收款人身份证号',
+            type: 'warning',
+          })
+          return
+        }
+         if (this.customerList.payeeNumberCard.length != 18) {
+          this.$message({
+            message: '收款人身份证号输入有误，请重新输入',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.customerList.customerPhone) {
+          this.$message({
+            message: '请输入手机号',
+            type: 'warning',
+          })
+          return
+        }
+         if (this.customerList.customerPhone.length != 11) {
+          this.$message({
+            message: '输入的手机号有误，请重新输入',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.customerList.compAddress) {
+          this.$message({
+            message: '请输入联系地址',
+            type: 'warning',
+          })
+          return
+        }
         // 验证码校验
         GetCustomerCodeJY({
             phone: this.customerList.customerPhone,

src/views/houseSelfCollect/inspectInfo.vue

@@ -115,7 +115,7 @@
       <div slot="footer">
         <inspectInfoPrint :printData="inspect" ref="saveImg"></inspectInfoPrint>
         <div class="bottom-row4">
-          <el-button type="primary" @click="isShowPrint= false">关闭</el-button>
+          <el-button type="primary" @click="closePrint">关闭</el-button>
           <el-button type="primary" @click="printSmall">打印小票</el-button>
           <el-button type="primary" @click="printBig">打印单据</el-button>
         </div>
@@ -175,8 +175,11 @@
       }
     },
     activated() {
-      
       this.types = this.$route.query.type
+      if(!this.types){
+          this.types = 1
+           this.information = '添加'
+      }
       this.cangid = this.$route.query.cangid
       this.warehouseName = this.$route.query.warehouseName
       this.cangNo = this.$route.query.warehouseNo
@@ -251,6 +254,10 @@
           }
         });
       },
+      closePrint(){
+        this.isShowPrint = false
+        this.$router.push({path:'inspectionManagement'})
+      },
       print() {
         if (!this.inspect.qualityNo) {
           this.$message({
@@ -459,6 +466,7 @@
         }
       },
       cancel() {
+        this.types = ""
         this.inspect = [] 
         this.$router.push({
           path: 'inspectionManagement'

src/views/houseSelfCollect/inspectionManagement.vue

@@ -217,7 +217,6 @@ export default {
     selectWarehouse(){
        selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        personCharge: sessionStorage.getItem('ws-pf_staffName'),
       })
         .toPromise()
         .then((response) => {

src/views/houseSelfCollect/paymentManagement.vue

@@ -304,7 +304,6 @@ export default {
     this.userJurisdiction = getHp('acquisitionManagement.acquisitionPay.print')
     selectWarehouseSelf({
       compId: sessionStorage.getItem('ws-pf_compId'),
-      personCharge: sessionStorage.getItem('ws-pf_staffName'),
     })
       .toPromise()
       .then((response) => {
@@ -370,6 +369,9 @@ export default {
           return false
         })
     },
+    find(){
+       this.getList()
+    },
     settlement(index, row) {
       var data = {}
       var data1 = {}
@@ -378,7 +380,6 @@ export default {
           data = this.warehouseList[i]
         }
       }
-      console.log(data)
       for (let i = 0; i < data.purchasePriceList.length; i++) {
         if (data.purchasePriceList[i].goodsName == row.goodsName) {
           data1 = data.purchasePriceList[i]
@@ -394,7 +395,6 @@ export default {
       if (this.modification.length == 0) {
         this.$message.warning('请选择要付款的条目')
       } else {
-        console.log(this.modification)
         let sum = 0
         let count = 0
         for (let i = 0; i < this.modification.length; i++) {
@@ -443,8 +443,9 @@ export default {
       }
       this.payments.paymentScreenshot = this.imageUrl
       this.payments.cashier = sessionStorage.getItem('ws-pf_staffName')
+      this.payments.paymentManagementList = this.modification
       console.log(this.payments,"付款")
-      return
+      
 
       this.$confirm('确定提交付款信息？', '提示', {
         confirmButtonText: '确定',
@@ -460,8 +461,10 @@ export default {
                 title: '成功',
                 message: '付款成功',
               })
+               this.paymentForm = false
+               this.getList()
               // this.paymentList = response
-              this.$router.go(-1)
+              // this.$router.go(-1)
             })
         })
         .catch(() => {
@@ -645,6 +648,7 @@ export default {
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
   width: 30%;
+  min-width: 125px;
   text-align: center;
   background: #ffffff;
   color: #8890b1;
@@ -660,7 +664,7 @@ export default {
   text-align: center !important;
   padding: 10px 0 !important;
   height: auto !important;
-  border: none;
+  // border-bottom: none !important;
   border-top-left-radius: 3px;
   border-top-right-radius: 3px;
 }

src/views/houseSelfCollect/settlement.vue

@@ -680,6 +680,7 @@ export default {
         }
 
       this.paymentList.id=this.$route.query.id 
+      this.paymentList.amountIngPayable = this.paymentList.actualPayment
       this.paymentList.settlementClerk =  sessionStorage.getItem('ws-pf_staffName')
       postpaymentedit(this.paymentList).toPromise().then((response) => {
          getpaymentexamine({id:this.$route.query.id}).toPromise().then((response) => {

src/views/houseSelfCollect/weighingManagement.vue

@@ -76,17 +76,17 @@
         label="称重时间"
       >
         <template slot-scope="scope">
-          <sapn
+          <div
             v-if="
               scope.row.status == '已称毛重'
             "
-            > {{scope.row.grossDate}}</sapn
+            > {{scope.row.grossDate}}</div
           >
-         <sapn
+         <div
             v-if="
               scope.row.status == '已称皮重'
             "
-            > {{scope.row.tareDate}}</sapn
+            > {{scope.row.tareDate}}</div
           >
         </template></el-table-column>
       <el-table-column prop="status" label="状态"></el-table-column>
@@ -99,10 +99,12 @@
             "
             >毛重</el-button
           >
+          <!-- scope.row.paymentManagement.status == '待结算' && -->
           <el-button
+          :disabled = "scope.row.allow == 2"
             @click="weightCheck(scope.row, 2)"
             v-if="
-              scope.row.status == '已称毛重' || scope.row.status == '已称皮重'
+              scope.row.status == '已称毛重' || scope.row.status == '已称皮重' 
             "
             >皮重</el-button
           >
@@ -174,6 +176,8 @@ export default {
         qualityInspectionManagement:{},
       },
       purchasePriceList:[],
+      allowEdit:"",
+      disabled:false
     }
   },
   activated() {
@@ -210,6 +214,7 @@ export default {
         if (this.warehouseList[i].value == e) {
           this.warehouseId = this.warehouseList[i].warehouseId
          this.purchasePriceList = this.warehouseList[i].warehouseList
+          this.allowEdit = this.warehouseList[i].allowEdit
         }
       }
       this.getList()
@@ -231,7 +236,8 @@ export default {
           netWeight: row.netWeight,
           relationId: row.relationId,
           warehouseId: this.warehouseId,
-          purchasePriceList: this.purchasePriceList
+          purchasePriceList: this.purchasePriceList,
+          allowEdit:this.allowEdit
         },
       })
     },
@@ -256,7 +262,6 @@ export default {
     selectWarehouse(){
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        personCharge: sessionStorage.getItem('ws-pf_staffName'),
       })
         .toPromise()
         .then((response) => {
@@ -265,9 +270,11 @@ export default {
             this.warehouseList.push({
               value: response[i].warehouseName,
               warehouseId: response[i].id,
-              warehouseList:response[i].purchasePriceList
+              warehouseList:response[i].purchasePriceList,
+              allowEdit:response[i].allowEdit
             })
           }
+          this.allowEdit = this.warehouseList[0].allowEdit
           this.warehouseName = this.warehouseList[0].value
           this.warehouseId = this.warehouseList[0].warehouseId
           this.purchasePriceList = this.warehouseList[0].warehouseList
@@ -286,8 +293,20 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          for(let i = 0 ; i < response.records.length ; i++){
+            if(response.records[i].paymentManagement){
+              if(response.records[i].paymentManagement.status == '待结算'){
+                  response.records[i].allow = 1
+              }else{
+                response.records[i].allow = 2
+              }
+            }else{
+              response.records[i].allow = 1
+            }  
+          }
           this.weighingList = response.records
           this.deptBudgetTotal = response.total
+
         })
         .catch((response) => {
           // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))

src/views/houseSelfCollect/weightCheck.vue

@@ -123,7 +123,6 @@
                   placeholder="请输入扣杂"
                   maxlength="100"
                   size="small"
-                  :disabled="disabled"
                 />
               </ws-form-item>
 
@@ -162,11 +161,10 @@
       :visible.sync="isShowPrint"
       title="粮食检斤单"
       @close="closeDialog"
-      
     >
       <weightCheckPrint :tableData="inspect" ref="saveImg"></weightCheckPrint>
       <div style="text-align:center">
-      <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
+      <el-button type="primary" @click="closePrint">关闭</el-button>
       <el-button type="primary" @click="printSmall">打印小票</el-button>
       <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
@@ -219,6 +217,13 @@ export default {
     this.warehouseId = this.$route.query.warehouseId
     this.weighingList.grossWeight = this.$route.query.grossWeight
     this.purchasePriceList = this.$route.query.purchasePriceList
+    this.allowEdit = this.$route.query.allowEdit
+    if( this.allowEdit == 0){
+      this.disabled = true
+    }else if(this.allowEdit == 1){
+      this.disabled = false
+    }
+    console.log(this.disabled)
     if (this.tpyeNo == 1) {
       this.information = '毛重'
     } else if (this.tpyeNo == 2) {
@@ -276,6 +281,10 @@ export default {
         }
       })
     },
+    closePrint(){
+      this.isShowPrint = false
+      this.$router.push({path:'weighingManagement'})
+    },
     print() {
       if (!this.weighingList.grossWeight) {
         this.$message({

src/views/outboundManagement/collectionManagement.vue

@@ -3,9 +3,18 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button type="primary">待收款</ws-button>
-        <ws-button type="primary">已收款</ws-button>
-        <ws-button type="primary">全部</ws-button>
+        <ws-button 
+            :type="searchType == 3 ? 'primary' : ''"
+            @click="handlestatus(3)"
+        >待收款</ws-button>
+        <ws-button 
+            :type="searchType == 4 ? 'primary' : ''"
+            @click="handlestatus(4)"
+        >已收款</ws-button>
+        <ws-button 
+            :type="searchType == '' ? 'primary' : ''"
+            @click="handlestatus('')"
+        >全部</ws-button>
         <ws-button type="primary" @click="adopt">备注</ws-button>
         <ws-button type="primary" @click="collect">收款</ws-button>
       </template>
@@ -14,6 +23,7 @@
           style="text-align: right; line-height: 60px; padding-right: 10px"
           :span="8"
         >
+        <div class="el-input el-input--small el-input--suffix">
           <el-select
             v-model="contractNo"
             placeholder="请选择合同"
@@ -25,28 +35,30 @@
             type="input"
             class="findValue"
           >
+       
             <el-option
-              v-if="item.reportStatus"
+              v-if="item.listStatus"
               v-for="item in options"
               :key="item.constKey"
-              :label="item.contractNo + '(' + item.reportStatus + ')'"
+              :label="item.contractNo + '(' + item.listStatus + ')'"
               :value="item.contractNo"
             />
             <el-option
-              v-if="!item.reportStatus"
+              v-if="!item.listStatus"
               v-for="item in options"
               :key="item.constKey"
               :label="item.contractNo"
               :value="item.contractNo"
             />
           </el-select>
+             </div>
         </el-col>
       </template>
     </BaseHeaderLayout>
     <el-table
-      :data="warehouseList"
+      :data="collectList"
       style="width: 100%; margin-top: 20px"
-      ref="warehouseList"
+      ref="collectList"
       border
       height="780"
       @selection-change="handleSelectionChange"
@@ -64,91 +76,88 @@
       </el-table-column>
       <el-table-column
         class="table_td"
-        prop="closingQuantity"
+        prop="carNo"
         label="车牌号"
       ></el-table-column>
       <el-table-column
         class="table_td"
-        prop="transactionPrice"
+        prop="goodsName"
         label="货名"
       ></el-table-column>
       <el-table-column
         class="table_td"
-        prop="amountIngPayable"
+        prop="grossWeight"
         label="毛重（公斤）"
       ></el-table-column>
       <el-table-column
         class="table_td"
-        prop="amountEdPayable"
+        prop="tare"
         label="皮重（公斤）"
       ></el-table-column>
       <el-table-column
         class="table_td"
-        prop="amountIngPayable"
+        prop="netWeight"
         label="净重（公斤）"
       ></el-table-column>
       <el-table-column
         class="table_td"
-        prop="closeRate"
+        prop="contractPrice"
         label="合同单价（元/公斤）"
         width="150"
       ></el-table-column>
       <el-table-column
-        class="table_td"
-        prop="basisPrice"
-        label="计算应收（元）"
-      ></el-table-column>
-
-       <el-table-column
-        class="table_td"
-        prop="basis"
-        label="计算应收（元）"
-        width="100"
-      >
-        <template slot-scope="scope">
-          <div class="inputChenge">
-          <input
-            style="width: 60px"
-            v-model="scope.row.basis"
-            type="text"
-          />
-          </div>
-          <img
-            width="17"
-            height="18"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/edit.png"
-            @click="whether(scope.row)"
-            v-if="scope.row.identification == 'false'"
-            alt=""
-          />
-          <i
-            class="el-icon-check"
-            style="line-height: 29px; margin-left: 10px"
-            @click="varietyClick(scope.row)"
-            v-if="scope.row.identification == 'true'"
-          ></i>
-        </template>
-      </el-table-column>
-
+         width='150'
+          class="table_td"
+          prop="calculationCollectable"
+          label="计算应收（元）"
+        ></el-table-column>
       <el-table-column
         class="table_td"
-        prop="basisPrice"
+        width='200'
+        prop="actualCollectionment"
         label="实际应收（元）"
-      ></el-table-column>
+      >
+      <template slot-scope="scope">
+            <div class="inputChenge">
+              <!-- readonly -->
+              <el-input
+                v-model="scope.row.actualCollectionment"
+                v-if="scope.row.identification == 'true'"
+              ></el-input>
+              <div v-if="scope.row.identification == 'false'" class="inputs">
+                {{ scope.row.actualCollectionment }}
+              </div>
+            </div>
+            <img
+              width="17"
+              height="18"
+              style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png"
+              @click="whether(scope.row)"
+              v-if="scope.row.identification == 'false'"
+              alt=""
+            />
+            <i
+              class="el-icon-check"
+              style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification == 'true'"
+              @click="varietyClick(scope.row)"
+            ></i>
+            <!-- <div>—</div> -->
+          </template></el-table-column>
       <el-table-column
         class="table_td"
-        prop="collectDate"
+        prop="amountEdCollectionable"
         label="已收款(元)"
       ></el-table-column>
       <el-table-column
         class="table_td"
-        prop="collectionIngPayable"
+        prop="collectionDate"
         label="收款时间"
       ></el-table-column>
       <el-table-column
         class="table_td"
-        prop="collectionEdPayable"
+        prop="status"
         label="状态"
       ></el-table-column>
       <el-table-column
@@ -156,8 +165,9 @@
         prop="collectionEdPayable"
         label="操作"
         width="200"
-      >
-        <el-button @click="collectment(2)">查看</el-button>
+      ><template scope="scope">
+        <el-button @click="collectment(2,scope.row)">查看</el-button>
+        </template>
       </el-table-column>
     </el-table>
     <!-- 收款 -->
@@ -185,7 +195,7 @@
         </el-form-item>
         <el-form-item
           label="收款日期"
-          prop="submissionDate"
+          prop="collectionDate"
           :label-width="formLabelWidth"
           class="deal"
         >
@@ -218,7 +228,6 @@
       </div>
     </el-dialog>
     <!--备注-->
-
     <el-dialog
       width="25%"
       title="备注"
@@ -237,10 +246,9 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="collectForm1 = false">取 消</el-button>
-        <el-button type="primary" @click="collectSubmit1">保存</el-button>
+        <el-button type="primary" @click="adoptRemarks()">保存</el-button>
       </div>
     </el-dialog>
-
     <!-- <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint> -->
     <div style="text-align: center">
       <el-pagination
@@ -256,7 +264,13 @@
   </div>
 </template>
 <script>
-import {} from '@/model/houseSelfCollect/index'
+import {
+  getcollection,
+  editcollect,
+  remarksAdd,
+  moneyCollection,
+  contractList
+} from '@/model/outboundManagement/index'
 export default {
   watch: {},
   data() {
@@ -264,6 +278,7 @@ export default {
       //分页
       currentPage: 1,
       pageSize: 10,
+      allmoney1:0,
       deptCircularPage: {},
       deptBudgetTotal: 0,
       warehouseList: [
@@ -271,10 +286,31 @@ export default {
           collectionEdPayable: '快收款',
         },
       ],
+      options:[],
+      contractNoList:[],
+      contractNo: '全部合同',
       dialogVisible: false,
       form: {},
+      compId: sessionStorage.getItem('ws-pf_compId'),
       collectForm: false,
       collectForm1: false,
+      managementType : 3,
+      remarks:'',
+       money: 0,
+      //  id:'',
+      collectmoney: 0,
+      paymentManagementList:[],
+      collectionManagement:{
+          paymentManagementList:[],
+          remarks:'',
+      },
+      collectList:[],
+      collectionDate: '',
+      collectionScreenshot: '',
+      amountEdCollectionable:'',
+      actualCollectionment:'',
+      // collectDate: '',
+      calculationCollectable:'',
       taskTypeList: ['一号库'],
       searchType: '',
       searchTypeText: '',
@@ -284,53 +320,55 @@ export default {
       modification: [],
     }
   },
-  activated() {},
+  activated() {
+    this.getList()
+  },
   methods: {
     contractchange(e) {
       this.contractNo = e
       this.getList()
     },
-        //修改基差
+    //修改实际应收
     varietyClick(row) {
-    //   if (row.basis) {
-    //     if (isNaN(row.basis)) {
-    //       this.$message({
-    //         message: '基差非数字!',
-    //         type: 'warning',
-    //       })
-    //       return
-    //     }
-    //   }
-    //   if (
-    //     (row.basis&&
-    //       String(row.basis).indexOf('.') != -1 &&
-    //       String(row.basis).length -
-    //         (String(row.basis).indexOf('.') + 1) >
-    //         2) ||
-    //     row.basis > 100000 ||
-    //     row.basis < -100000
-    //   ) {
-    //     this.$message({
-    //       message: '基差输入错误',
-    //       type: 'warning',
-    //     })
-    //     return
-    //   }
-    //   if (!String(row.basis)) {
-    //     this.$message({
-    //       message: '基差不能为空！',
-    //       type: 'warning',
-    //     })
-    //     return
-    //   }
-      this.$confirm(`确定要修改应收？`, {
+       if (
+        row.actualCollectionment < 0 ||
+        row.actualCollectionment > 100000 ||
+        (String(row.actualCollectionment).indexOf('.') != -1 &&
+          String(row.actualCollectionment).length -
+            (String(row.actualCollectionment).indexOf('.') + 1) >
+            2)
+      ) {
+        this.$message({
+          message: '金额输入错误',
+          type: 'warning',
+        })
+        return
+      }
+      if (row.actualCollectionment) {
+        if (isNaN(row.actualCollectionment)) {
+          this.$message({
+            message: '金额非数字!',
+            type: 'warning',
+          })
+          return
+        }
+      }
+      if (!row.actualCollectionment) {
+        this.$message({
+          message: '金额不能为空！',
+          type: 'warning',
+        })
+        return
+      }
+      this.$confirm(`确定要修改实际应收？`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       })
         .then(() => {
-          editCollect({
-            basis: row.basis,
+          editcollect({
+            actualCollectionment: row.actualCollectionment,
+            amountNotCollectable:row.actualCollectionment-row.amountEdCollectionable,
             id: row.id,
           })
             .toPromise()
@@ -350,46 +388,125 @@ export default {
     whether(row) {
       row.identification = 'true'
     },
-    collectment(index) {
-      this.$router.push({ path: 'collectionment', query: { type: index } })
+    handlestatus(status) {
+      this.searchType = status
+      this.getList()
+    },
+    // ,relationId :row.relationId
+    collectment(index,row) {
+      this.$router.push({ path: 'collectionment', 
+      query: { 
+      type: index, 
+      id: row.id ,
+      relationId :row.relationId,
+      compId: sessionStorage.getItem('ws-pf_compId')} })
+      // this.$router.push({ path: 'settlement', query: { type: index,id: row.id,waterMin:data1.waterMin} })
     },
     collect() {
+       this.allmoney1=0
       if (this.modification.length == 0) {
-        this.$message.warning('请选择要收款的条目')
+        this.$message.warning('请选择一条要收款的条目')
       } else {
+        for (var i = 0; i < this.modification.length; i++) {
+          this.allmoney1 += this.modification[i].actualCollectionment - this.modification[i].amountEdCollectionable
+        }
         this.collectForm = true
       }
     },
     collectSubmit() {
-      this.$confirm('确定提交收款信息？', '提示', {
-        confirmButtonText: '确定',
+     
+      this.$confirm(`确定提交收款信息？`, {
         cancelButtonText: '取消',
+        confirmButtonText: '确定',
         type: 'warning',
-      })
-        .then(() => {})
-        .catch(() => {
-          return false
+      }).then(() => {
+        moneyCollection({
+          paymentManagementList: this.modification,
+          money: this.collectmoney,
+          collectionDate: this.collectionDate,
+          collectionScreenshot: this.collectionScreenshot,
         })
+          .toPromise()
+          .then((response) => {
+            this.$message.success('收款成功')
+            this.collectmoney=''
+            this.collectionDate=''
+            this.collectionScreenshot=''
+            this.collectForm = false
+            this.getList()
+          })
+      })
+    },
+    //添加备注信息
+    adopt() {
+      this.remarks = this.remarks
+      this.paymentManagementList = this.collectList[0].paymentManagementList
+      if (this.modification.length == 0) {
+        this.$message.warning('请选择要备注的条目')
+      } else {
+        this.collectForm1 = true
+      }
     },
-    collectSubmit1() {
-      this.$confirm('确定保存备注信息？', '提示', {
+    adoptRemarks() {
+      this.collectionManagement.remarks = this.remarks
+      this.$confirm(`确定要保存备注信息？`, {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
       })
-        .then(() => {})
-        .catch(() => {
-          return false
+        .then(() => {
+          remarksAdd({
+            paymentManagementList : this.modification,
+            remarks: this.remarks
+            })
+            .toPromise()
+            .then(() => {
+            this.collectForm1 = false
+            this.$message.success('添加备注信息成功')
+            this.paymentManagementList = {}
+            this.getList()
+
+            })
+            .catch(() => {
+              return false
+            })
         })
     },
+    //     disableReasons() {
+    //   this.outerVisible = false
+    //   this.disablieForm.disableStatusFlag = 0
+    //   disableDriver(this.disablieForm)
+    //     .toPromise()
+    //     .then((response) => {
+    //       this.$notify.success({
+    //         title: '成功',
+    //         message: '禁用成功',
+    //       })
+    //       this.getList()
+    //     })
+    //     .catch((response) => {
+    //       EventBus.$emit('error', response.message)
+    //     })
+    // },
     handlePictureCardPreview1(file) {
       this.collectionScreenshot = file.url
     },
-    adopt() {
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择要备注的条目')
+    dataFilter(val) {
+      // console.log(val,"名")
+      this.contractNo = val 
+      if (val) {
+        //val存在
+        this.options = this.contractNoList.filter(item => {
+          if (
+            !!~item.contractNo.indexOf(val) ||
+            !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
+          ) {
+            return true
+          }
+        })
       } else {
-        this.collectForm1 = true
+        //val为空时，还原数组
+        this.options = this.contractNoList
       }
     },
     selectInit(row) {
@@ -405,28 +522,39 @@ export default {
       }
     },
     getList(){
-      detailsList({
+     getcollection({
+       managementType : this.managementType,
+       currentPage:this.currentPage,
+       pageSize:this.pageSize,
+       searchKeyWord:this.searchKeyWord,
+       searchType:this.searchType,
+       warehouseName:this.warehouseName,
+       contractNo: this.contractNo,
+      }).toPromise().then((response) => {
+          for (var i = 0; i < response.records.length; i++) {
+            response.records[i].identification = 'false'
+          }
+           this.collectList = response.records
+        })
+      contractList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        pcFlag: this.pcFlag,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
       })
         .toPromise()
         .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            response.records[i].identification = 'false'
-          }
-          this.warehouseList = response
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
+          this.contractNoList = response
+          this.contractNoList.unshift({contractNo:'全部合同'})
+          this.options=this.contractNoList
+          console.log( this.options[0].listStatus)
         })
-      }
+   },
+    handleRemove(file) {
+      console.log(file)
     },
     handleSelectionChange(val) {
       this.modification = val
+      
     },
     selecttaskType() {},
     handleSizeChange(val) {
@@ -439,6 +567,7 @@ export default {
       console.log(`当前页: ${val}`)
       this.getList()
     },
+},
 }
 </script>
 <style lang="scss" scoped>
@@ -480,5 +609,24 @@ export default {
   width: 40%;
   display: inline-flex;
 }
+.deal {
+  width: 66%;
+}
+.inputs {
+  margin: 0 auto;
+}
+.el-col-8 {
+    width: 33.33333%;
+}
+/deep/.findValue .el-input__inner {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  width: 385px;
+}
+/deep/.el-select .el-input .el-input--small .el-input--suffix {
+    display: block;
+    font-size: 13px;
+    margin-left: -67px;
+}
 </style>
 

src/views/outboundManagement/collectionment.vue

@@ -22,12 +22,14 @@
       </el-col>
     </el-row>
     <div class="substance">
-      <ws-form>
+      <ws-form
+      ref="collectionList">
         <div style="width: 50%; margin: 0 auto">
           <div class="title">基本信息</div>
           <ws-info-table>
             <ws-form-item label="合同编号" span="1" prop="contractNo">
               <ws-input
+              v-model="collectionList.contractNo" 
                 placeholder="请输入合同编号"
                 maxlength="100"
                 disabled
@@ -36,6 +38,7 @@
             </ws-form-item>
             <ws-form-item label="仓位号" span="1" prop="binNumber">
               <ws-input
+              v-model="collectionList.weighingManagement.binNumber" 
                 placeholder="请输入仓位号"
                 maxlength="100"
                 size="small"
@@ -43,39 +46,37 @@
               />
             </ws-form-item>
             <ws-form-item label="货名" span="1" prop="goodsName">
-              <ws-select
-                v-model="warehouseList.a"
-                placeholder="请输入货名"
-                class="typeselect"
-                @change="selectpackingMethod"
-               disabled
-              >
-                <ws-option
-                  v-for="item in goodnameList"
-                  :key="item.constKey"
-                  :label="item.constValue"
-                  :value="item.constValue"
-                />
-              </ws-select>
+                <ws-input 
+                v-model="collectionList.goodsName" 
+                placeholder="请输入货名" 
+                maxlength="100" 
+                size="small" 
+                disabled />
             </ws-form-item>
-            <ws-form-item label="囤位号" span="1" prop="storageTagNo">
-              <ws-input placeholder="请输入囤位号" maxlength="100" size="small" disabled />
+            <ws-form-item label="囤位号" span="1" prop="storageNumber">
+              <ws-input 
+              v-model="collectionList.weighingManagement.storageNumber" 
+              placeholder="请输入囤位号" maxlength="100" size="small" disabled />
             </ws-form-item>
-            <ws-form-item label="单价(元/公斤)" span="1" prop="waterContent">
-              <ws-input placeholder="请输入单价" maxlength="100" size="small" disabled/>
+            <ws-form-item label="单价(元/公斤)" span="1" prop="contractPrice">
+              <ws-input 
+              v-model="collectionList.contractPrice" placeholder="请输入单价" maxlength="100" size="small" disabled/>
             </ws-form-item>
-            <ws-form-item label="车牌号" span="1" prop="carNumber">
-              <ws-input placeholder="请输入车牌号" maxlength="100" size="small" disabled/>
+            <ws-form-item label="车牌号" span="1" prop="carNo">
+              <ws-input 
+              v-model="collectionList.carNo" placeholder="请输入车牌号" maxlength="100" size="small" disabled/>
             </ws-form-item>
           </ws-info-table>
 
           <div class="title">质检数据</div>
           <ws-info-table>
-            <ws-form-item label="等级" span="1" prop="waterContent">
-              <ws-input placeholder="请输入编号" maxlength="100" size="small" disabled/>
+            <ws-form-item label="等级" span="1" prop="grade">
+              <ws-input 
+              v-model="collectionList.qualityInspectionManagement.grade" placeholder="请输入等级" maxlength="100" size="small" disabled/>
             </ws-form-item>
-            <ws-form-item label="杂质（%）" span="1" prop="waterContent">
+            <ws-form-item label="杂质（%）" span="1" prop="impurity">
               <ws-input
+              v-model="collectionList.qualityInspectionManagement.impurity"
                 placeholder="请输入杂质占比"
                 maxlength="100"
                 size="small"
@@ -84,33 +85,38 @@
             </ws-form-item>
             <ws-form-item label="水分（%）" span="1" prop="waterContent">
               <ws-input
+              v-model="collectionList.qualityInspectionManagement.waterContent"
                 placeholder="请输入水分占比"
                 maxlength="100"
                 size="small"
                 disabled
               />
             </ws-form-item>
-            <ws-form-item label="霉变粒（%）" span="1" prop="waterContent">
+            <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
               <ws-input
+              v-model="collectionList.qualityInspectionManagement.mildewGrain"
                 placeholder="请输入霉变粒占比"
                 maxlength="100"
                 size="small"
                 disabled
               />
             </ws-form-item>
-            <ws-form-item label="容重（克/升）" span="1" prop="waterContent">
-              <ws-input placeholder="请输入容重" maxlength="100" size="small" disabled/>
+            <ws-form-item label="容重（克/升）" span="1" prop="bulkDensity">
+              <ws-input 
+              v-model="collectionList.qualityInspectionManagement.bulkDensity" placeholder="请输入容重" maxlength="100" size="small" disabled/>
             </ws-form-item>
-            <ws-form-item label="热损伤（%）" span="1" prop="waterContent">
+            <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
               <ws-input
+              v-model="collectionList.qualityInspectionManagement.jiaorenli"
                 placeholder="请输入热损伤占比"
                 maxlength="100"
                 size="small"
                 disabled
               />
             </ws-form-item>
-            <ws-form-item label="不完整粒（%）" span="1" prop="waterContent">
+            <ws-form-item label="不完整粒（%）" span="1" prop="imperfectGrain">
               <ws-input
+              v-model="collectionList.qualityInspectionManagement.imperfectGrain"
                 placeholder="请输入不完整粒占比"
                 maxlength="100"
                 size="small"
@@ -122,13 +128,16 @@
           <div class="title">检斤信息</div>
           <ws-info-table>
             <ws-form-item label="毛重（公斤）" span="1" prop="grossWeight">
-              <ws-input placeholder="请输入毛重" maxlength="100" size="small" disabled/>
+              <ws-input 
+              v-model="collectionList.weighingManagement.grossWeight" placeholder="请输入毛重" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item label="皮重（公斤）" span="1" prop="tare">
-              <ws-input placeholder="请输入皮重" maxlength="100" size="small" disabled/>
+              <ws-input 
+              v-model="collectionList.weighingManagement.tare" placeholder="请输入皮重" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item label="净重（公斤）" span="1" prop="netWeight">
-              <ws-input placeholder="请输入净重" maxlength="100" size="small" disabled/>
+              <ws-input 
+              v-model="collectionList.weighingManagement.netWeight" placeholder="请输入净重" maxlength="100" size="small" disabled/>
             </ws-form-item>
           </ws-info-table>
           <div class="but">
@@ -140,14 +149,26 @@
   </div>
 </template>
 <script>
-import {} from '@/model/houseSelfCollect/index'
+import {
+  getcollectionexamine,
+} from '@/model/outboundManagement/index'
 export default {
   watch: {},
   data() {
     return {
-      warehouseList: {},
+      collectionList:{
+        goodsName:'',
+        contractNo:'',
+        binNumber:'',
+        carNo:'',
+        storageNumber:'',
+        contractPrice:'',
+        weighingManagement:{},
+        qualityInspectionManagement:{}
+        },
       disabled:false,
       types:'',
+      compId: sessionStorage.getItem('ws-pf_compId'),
       information:'结算',
     }
   },
@@ -157,12 +178,31 @@ export default {
          this.disabled=true
          this.information = '查看'   
     }
-    console.log( this.information)
+    this.getList()
   },
   methods: {
     cancel() {
       this.$router.push({ path: 'collectionManagement' })
     },
+     getList(){
+      getcollectionexamine({
+        id:this.$route.query.id,
+        relationId: this.$route.query.relationId,
+        compId: sessionStorage.getItem('ws-pf_compId'),
+      })
+      .toPromise()
+      .then((response) => {
+          this.collectionList = response
+          // this.qualityInspectionManagement = response
+          // this.paymentList.qualityInspectionManagement.waterMin=this.$route.query.waterMin
+          // this.paymentList.qualityInspectionManagement.weightDeduction=(this.paymentList.qualityInspectionManagement.waterContent-this.paymentList.qualityInspectionManagement.waterMin)*this.paymentList.buckleWeightRatio
+          // this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
+          // this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
+          // if(!this.paymentList.solidGrainPrice){
+          //   this.paymentList.solidGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
+          // }
+        })
+    },
   },
 }
 </script>

src/views/outboundManagement/qualityInspectionManagement.vue

@@ -142,7 +142,6 @@ export default {
     getList() {
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId'),
-        personCharge: sessionStorage.getItem('ws-pf_staffName'),
       })
         .toPromise()
         .then((response) => {

src/views/outboundManagement/weighing.vue

@@ -66,11 +66,15 @@
 						<div class="bangdan">
 							<el-form-item label="上传磅单" v-if="this.types == 1">
 							</el-form-item>
-							<el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+							<!-- <el-upload action="https://www.zthymaoyi.com/upload/admin" 
+								list-type="picture-card"
 								:on-success="(res, file) => {handlePictureCardPreview1(res)}"
-								:on-remove="(value) => {handleRemove(value)}" class="photo2" v-if="this.types == 1">
+								:on-remove="handleRemove" class="photo2" v-if="this.types == 1">
 								<i class="el-icon-plus"></i>
-							</el-upload>
+							</el-upload> -->
+							<ws-upload ref="upload" :comp-id="compId" :appendix-ids="weighingList.addressUrl"
+								:size-limit="size" @onChange="onChange" v-if="this.types == 1"
+								accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
 							<el-dialog :visible.sync="dialogVisible" v-if="this.types == 1">
 								<img width="100%" :src="weighingList.addressUrl" alt="" />
 							</el-dialog>
@@ -89,12 +93,17 @@
 	import {
 		grossWeight,
 		getbinNumber,
-		contractList,
+		contractListWeighing,
 		tareAdd,
 		tareEdit,
 		getweighing
 	} from '@/model/outboundManagement/index'
+	import WsUpload from '@/components/WsUpload'
+	import {EventBus} from 'base-core-lib'
 	export default {
+		components: {
+			WsUpload,
+		},
 		data() {
 			return {
 				inspect: {},
@@ -103,6 +112,7 @@
 				weighingList: {
 					carNumber: '',
 					storageNumber: '',
+					addressUrl: '',
 					buckleMiscellaneous: 0,
 					compId: sessionStorage.getItem('ws-pf_compId'),
 				},
@@ -132,6 +142,8 @@
 				],
 				relationId: '',
 				warehouseId: '', //仓库id
+				compId: sessionStorage.getItem('ws-pf_compId'),
+				size: 10,
 			}
 		},
 		activated() {
@@ -163,9 +175,18 @@
 					return
 				}
 			},
-			handlePictureCardPreview1(file) {
-				this.weighingList.addressUrl += file.url + ','
-				this.addressUrls.push(file.url)
+			//附件
+			//上传附件
+			onChange() {
+				this.$refs.upload
+					.handleSaveBill()
+					.then(async response => {
+						this.weighingList.addressUrl = response
+					})
+					.catch(res => {
+						EventBus.$emit('error', (JSON.parse(res) || {}).message)
+						this.$refs.upload.clearFiles()
+					})
 			},
 			cancel() {
 				this.weighingList = {}
@@ -213,7 +234,7 @@
 						}
 					})
 				//合同编号
-				contractList({
+				contractListWeighing({
 						compId: sessionStorage.getItem('ws-pf_compId'),
 						flag: 5
 					})

src/views/outboundManagement/weighingManagement.vue

@@ -40,10 +40,10 @@
 			<el-table-column prop="secretaryWeigher" label="司称员"></el-table-column>
 			<el-table-column prop="grossDate" label="称重时间">
 				<template slot-scope="scope">
-				{{scope.row.grossDate}}
-				<span v-if="scope.row.grossDate == null">
-            		{{scope.row.tareDate}}
-          		</span>
+					{{scope.row.grossDate}}
+					<span v-if="scope.row.grossDate == null">
+						{{scope.row.tareDate}}
+					</span>
 				</template>
 			</el-table-column>
 			<el-table-column prop="addressUrl" label="附件">
@@ -51,7 +51,7 @@
 					<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
 						src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
 					<span v-if="scope.row.addressUrlArray != null">
-						{{scope.row.addressUrlArray.length == 0? '': scope.row.addressUrlArray.length}}
+						{{scope.row.addressUrlArray.length == 0? "":scope.row.addressUrlArray.length}}
 					</span>
 				</template>
 			</el-table-column>
@@ -72,10 +72,8 @@
 		</div>
 		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
 			@on-cancel="handleClose">
-			<p>查看附件</p>
-			<div style="display: inline-block; margin: 5px" v-for="item in appendixIdss">
-				<img width="100" height="100" :src="item" alt="" />
-			</div>
+			<ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
 		</WinseaContentModal>
 	</div>
 </template>
@@ -85,9 +83,7 @@
 		selectWarehouseSelf,
 		delelteWeighing,
 	} from '@/model/outboundManagement/index'
-	import {
-		EventBus
-	} from 'base-core-lib'
+	import {EventBus} from 'base-core-lib'
 	import WsUpload from '@/components/WsUpload'
 	export default {
 		components: {
@@ -195,7 +191,6 @@
 			selectWarehouse() {
 				selectWarehouseSelf({
 						compId: sessionStorage.getItem('ws-pf_compId'),
-						personCharge: sessionStorage.getItem('ws-pf_staffName'),
 					})
 					.toPromise()
 					.then((response) => {
@@ -258,7 +253,7 @@
 				} else {
 					this.accessoryTFs = true
 				}
-				this.appendixIdss = row.addressUrlArray
+				this.appendixIdss = row.addressUrl
 			},
 			handleClose() {
 				this.dialogViewSpareMoney = false

src/views/platformaudit/grainpulseenterprisereview.vue

@@ -591,7 +591,7 @@ export default {
         })
         return
       }
-      if (this.companyList1.mainBusinessType.length<2) {
+      if (this.companyList1.mainBusinessType.length<1) {
         this.$message({
           message: '至少选择一个主营类型',
           type: 'warning',

src/views/warehouse/warehouseManagementAdd.vue

@@ -75,13 +75,14 @@
           <el-select
             v-model="deptBudgetList.otherPersonCharge"
             placeholder="请选择其他负责人"
+            @change="selectstaffOther"
             multiple
           >
             <el-option
-              v-for="item in options"
+              v-for="item in optionsOther"
               :key="item.value"
               :label="item.staffName"
-              :value="item.staffName"
+              :value="item.staffName + ' ' + item.staffMobilePhone "
             />
           </el-select>
         </ws-form-item>
@@ -274,6 +275,7 @@ export default {
       radio: 1,
       personCharge: [],
       options: [],
+      optionsOther: [],
       staffList: [],
       polygons: [
         {
@@ -356,6 +358,14 @@ export default {
         this.options = this.staffList
       }
     },
+    selectstaffOther(e) {
+      // for (var i = 0; i < this.staffList.length; i++) {
+      //   if (this.staffList[i].staffName == e) {
+      //     this.deptBudgetList.personPhone = this.staffList[i].staffMobilePhone
+      //     this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+      //   }
+      // }
+    },
     selectstaff(e) {
       for (var i = 0; i < this.staffList.length; i++) {
         if (this.staffList[i].staffName == e) {
@@ -690,8 +700,12 @@ export default {
         .then((response) => {
           // this.agent = response
           this.options = response
+          this.optionsOther = response
           this.staffList = response
           this.personCharge = response
+          // for(var i=0;i<response.length;i++){
+          //   this.optionsOther.push(response[i].staffName+" "+response[i].staffMobilePhone)
+          // }
         })
     },
     selectChapterTwo(e) {

src/views/warehouse/warehouseManagementEdit.vue

@@ -85,10 +85,10 @@
             multiple
           >
             <el-option
-              v-for="item in options"
+              v-for="item in optionsOther"
               :key="item.value"
               :label="item.staffName"
-              :value="item.staffName"
+              :value="item.staffName + ' ' + item.staffMobilePhone "
             />
           </el-select>
         </ws-form-item>
@@ -311,6 +311,7 @@ export default {
         },
       },
       options: [],
+      optionsOther: [],
       value: '',
       accessoryTFs: false,
       addressUrls: [],
@@ -322,6 +323,7 @@ export default {
       .toPromise()
       .then((response) => {
         this.options = response
+        this.optionsOther = response
         this.staffList = response
       })
     this.showType = this.isShow