前端

src/views/warehousenew/component/router/index.js

@@ -524,21 +524,21 @@ const warehouseManagementRouter = {
       },
       hidden:true
     },
-    // {
-    //   path: 'gooddetail',
-    //   component: () =>
-    //     import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/gooddetail'),
-    //   name: 'gooddetail',
-    //   meta: {
-    //     title: 'gooddetail',
-    //     shortcutEntrance: 'warehouseManagementList',
-    //     module: 'warehouseManagement.warehouse.warehouseInfo',
-    //     permissicon: [],
-    //     keepAlive: true,
-    //     _title:'货权明细'
-    //     // module: 'procurement.sparepart.applDetail'
-    //   },
-    // },
+    {
+      path: 'gooddetail',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/gooddetail'),
+      name: 'gooddetail',
+      meta: {
+        title: 'gooddetail',
+        shortcutEntrance: 'warehouseManagementList',
+        module: 'warehouseManagement.warehouse.warehouseInfo',
+        permissicon: [],
+        keepAlive: true,
+        _title:'货权明细'
+        // module: 'procurement.sparepart.applDetail'
+      },
+    },
     {
       path: 'customerrecord',
       component: () =>

src/views/warehousenew/goodsrollIn.vue

@@ -27,7 +27,7 @@
                 <el-input disabled placeholder="自动获取，不可编辑" v-model="form.customer"></el-input>
             </el-form-item>
             <el-form-item label="货名">
-                <el-select @change="goosnamechange" v-model="form.goodsName" placeholder="选择货名">
+                <el-select filterable clearable @change="goosnamechange" v-model="form.goodsName" placeholder="选择货名">
                     <el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue" :value="item.constValue"></el-option>
                 </el-select>
             </el-form-item>
@@ -55,7 +55,7 @@
                 <el-input disabled v-model="form.amountNotPayable" placeholder="自动计算，不可编辑"></el-input>
             </el-form-item>
             <el-form-item label="库点">
-                <el-select @change="warehouseNamechange" v-model="form.warehouseName" placeholder="选择库点">
+                <el-select filterable clearable @change="warehouseNamechange" v-model="form.warehouseName" placeholder="选择库点">
                     <el-option  v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.warehouseName"></el-option>
                 </el-select>
             </el-form-item>
@@ -231,6 +231,7 @@ import {xialaNo} from '@/model/tasksport/index'
                 type: 'warning',
             })
                 .then(() => {
+                  console.log(this.form)
                     setrollin(this.form).toPromise()
                     .then((response) => {
                     this.$message.success('提交成功！')

src/views/warehousenew/warehousingOrder.vue

@@ -62,9 +62,9 @@
       <el-col style='text-align:right;' :span="12">
         <!-- <ws-button v-hasPermission="
             `warehouseManagement.warehousingOrder.yufu`" type="primary" @click="interestrate()" >{{interestratevalue.value}}利率</ws-button> -->
-        <!-- <ws-button  type="primary" @click="awatingransom()">待赎回</ws-button>
+        <ws-button  type="primary" @click="awatingransom()">待赎回</ws-button>
         <ws-button  type="primary" @click="editRollout()">修改赎回状态</ws-button>
-        <ws-button  type="primary" @click="goodrollOut()">货权转出</ws-button> -->
+        <ws-button  type="primary" @click="goodrollOut()">货权转出</ws-button>
         <ws-button  type="primary" @click="exportList()">导出</ws-button>
         <ws-button v-hasPermission="
         `warehouseManagement.warehousingOrder.yufu`" type="primary" @click="fieldrations()">折干</ws-button>
@@ -166,7 +166,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="outWarehouseWeight" width="80" class="table_td" label="出库重量"></el-table-column>
-        <!-- <el-table-column prop="transferOutWeight" width="200" class="table_td" label="转出">
+        <el-table-column prop="transferOutWeight" width="200" class="table_td" label="转出">
           <template scope="scope">
             <el-popover v-if="scope.row.transferOutWeight>0"
               placement="top-start"
@@ -177,7 +177,7 @@
             </el-popover>
             <span v-else>{{ scope.row.transferOutWeight }}</span>
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column prop="profitAndLoss" class="table_td" label="盈亏（吨）"></el-table-column>
         <el-table-column prop="surplusWeight" width="80" class="table_td" label="剩余重量"></el-table-column>
         <el-table-column prop="grainFund" width="80" class="table_td" label="粮款（元）"></el-table-column>
@@ -1027,6 +1027,7 @@ export default {
       this.$forceUpdate()
     },
     async goodrollOut(){
+      console.log(11111111111111)
       var concatarr=[]
       var arr=[]
       var arr3=[]
@@ -1041,18 +1042,16 @@ export default {
       for (const key in this.multipleSelection1) {
         var array = this.multipleSelection1[key]
         for (let i = 0; i < array.length; i++) {
-          if(array[i].amountEdPayable == 0 && !array[i].approveStatus||array[i].amountEdPayable == array[i].grainFund && !array[i].approveStatus){
+          if(array[i].amountEdPayable == 0 && !array[i].approveStatus&&array[i].redeemFlag!='赎'||array[i].amountEdPayable == array[i].grainFund && !array[i].approveStatus&&array[i].redeemFlag!='赎'){
             arr.push(array[i])
-          }else{
-            this.$message.error('请选择已付全款或未请款的条目！')
+          }else if(rray[i].redeemFlag=='赎'){
+            this.$message.error('请选择未货权转出的条目！')
             return
-          }
-          if(array[i].redeemFlag!='赎'){
-            arr.push(array[i])
           }else{
-            this.$message.error('请选择未货权转出的条目！')
+            this.$message.error('请选择已付全款或未请款的条目！')
             return
           }
+
           if (arr3.length == 0) {
             arr3.push(array[i])
           } else {
@@ -1108,6 +1107,7 @@ export default {
       this.rolloutData.amountEdPayable=0
       this.rolloutData.amountNotPayable=0
       this.rolloutData.amountIngPayable=0
+      console.log(arr)
       for (let i = 0; i < arr.length; i++) {
         this.rolloutData.transferOutWeight+=Number(arr[i].surplusWeight)
         this.rolloutData.amountEdPayable+=Number(arr[i].amountEdPayable)