1

src/views/warehousenew/gooddetail.vue

@@ -12,12 +12,12 @@
               <el-date-picker value-format='yyyy-MM-dd' v-model="value" type="daterange" align="right" unlink-panels range-separator="至"
               start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" class="data_css" @change="changeDate" >
             </el-date-picker></div>
-            <el-select style="margin-left:10px;" v-model="agent" multiple filterable allow-create default-first-option placeholder="按经办人筛选"
+            <el-select style="margin-left:10px;" v-model="agent" filterable allow-create default-first-option placeholder="按经办人筛选"
               clearable @change="getList1" class="options_css">
               <el-option v-for="item in personList" :key="item.id" :label="item.agent" :value="item.agent">
               </el-option>
             </el-select>
-            <el-input placeholder="可按业务编号、合同编号、客户查找" class="input_css" v-model="searchKeyWord"></el-input>
+            <el-input placeholder="可按业务编号、合同编号、客户查找"  class="input_css" v-model="searchKeyWord"></el-input>
             <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
                 src="../../../public/img/sousuo.png" alt="" /></el-button>
           </div>
@@ -115,7 +115,7 @@
         </div>
       </el-dialog>
       <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose">
+      @on-cancel="handleClose1">
       <ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
@@ -199,7 +199,7 @@ import {
 
       async getList() {
          var response=await getroll({
-            // warehouseType: 1,
+            agent: this.agent,
             startDate:this.startDate,
             endDate:this.endDate,
             searchKeyWord:this.searchKeyWord,
@@ -235,6 +235,9 @@ import {
         this.getList()
 
       },
+      getList1() {
+        this.getList()
+      },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)
         this.pageSize = val

src/views/warehousenew/goodsrollIn.vue

@@ -248,9 +248,7 @@ import {xialaNo} from '@/model/tasksport/index'
             this.$message.error('货名不能为空！')
             return
         }
-        
-        if(this.form.relationReceiveNo!='不关联'){
-          
+        if(this.form.redeemFlag==1){
           var weight=0
           var contarctNo=''
           for (let i = 0; i < this.form.redeemContractNoList.length; i++) {
@@ -268,10 +266,10 @@ import {xialaNo} from '@/model/tasksport/index'
           }
           this.form.redeemContractNo=contarctNo
           // console.log(Number(weight),Number(this.form.transferOutWeight1))
-          if(Number(weight)!=Number(this.form.transferOutWeight1)&&this.form.redeemFlag==1){
+          if(Number(weight)!=Number(this.form.transferOutWeight1)&&this.form.redeemFlag==1&&this.form.relationReceiveNo!='不关联'){
             this.$message.error('赎回重量与出库重量不相等！')
             return
-          }
+          }  
         }
         if(!this.form.avgCost){
             this.$message.error('平均成本不能为空！')
@@ -334,6 +332,7 @@ import {xialaNo} from '@/model/tasksport/index'
                         relationReceiveNo:'不关联',
                         redeemFlag:'0',
                         cargoPositionDetailsList:[{binNumber:'',positionId:'',weight:'',goodsweight:''}],
+                        redeemContractNoList:[{redeemContractNo:'',transferOutWeight:'',weight:''}],
                         compId: localStorage.getItem('ws-pf_compId')
                     }
                     this.$router.go(-1)