0319chukushenhe

src/components/OP/SuppliesInventory.vue

@@ -269,14 +269,18 @@
             </div>
         </el-dialog>
         <el-dialog top="10vh" class="Approval-dialog" width="1350px" title="领用审核" :visible.sync="ApprovalVisible">
-            <el-select @change="typevaluechange" style="width: 150px;margin-bottom: 10px;" size="small" v-model="typevalue" placeholder="请选择">
-                <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                </el-option>
-            </el-select>
+            <div>
+                <el-select @change="typevaluechange" style="width: 150px;margin-bottom: 10px;" size="small" v-model="typevalue" placeholder="请选择">
+                    <el-option
+                        v-for="item in receiveStatus"
+                        :key="item.value"
+                        :label="item.text"
+                        :value="item.value">
+                    </el-option>
+                </el-select>
+                <el-input clearable size="small" style="width:200px" v-model="Approvalinput" placeholder="请输入内容"></el-input>
+                <el-button @click="typevaluechange" size="small" type="primary">查 询</el-button>
+            </div>
             <div class="Approval-table">
                 <el-table
                     :data="ApprovalData"
@@ -338,12 +342,12 @@
                     label="操作"
                     width="450">
                     <template slot-scope="scope">
-                        <el-button v-if="scope.row.auditStatus==0||scope.row.auditStatus==2" size="mini" type="primary" title="通过" @click="GoodsReceiveAudit(scope.row.id,1)" >通过</el-button>
-                        <el-button v-if="scope.row.auditStatus==0" size="mini" type="info" title="不通过" @click="GoodsReceiveAudit(scope.row.id,2)">不通过</el-button>
-                        <el-button v-if="scope.row.auditStatus==1" size="mini" type="warning" title="取消通过" @click="GoodsReceiveAudit(scope.row.id,0)">取消通过</el-button>
-                        <el-button size="mini" title="删除" type="danger" @click="Deleteintolibraryreceives(scope.row)">删除</el-button>
-                        <el-button size="mini" type="primary" title="通过" @click="GoodsReceiveAudit(scope.row.id,5)" >出库</el-button>
-                        <el-button size="mini" title="拒绝出库" type="danger" @click="GoodsReceiveAudit(scope.row.id,6)">拒绝出库</el-button>
+                        <el-button v-if="scope.row.auditStatus==0||scope.row.auditStatus==2" size="mini" type="primary" title="通过" @click="GoodsReceiveAudit(scope.row,1)" >通过</el-button>
+                        <el-button v-if="scope.row.auditStatus==0" size="mini" type="info" title="不通过" @click="GoodsReceiveAudit(scope.row,2)">不通过</el-button>
+                        <el-button v-if="scope.row.auditStatus==1" size="mini" type="warning" title="取消通过" @click="GoodsReceiveAudit(scope.row,0)">取消通过</el-button>
+                        <!-- <el-button size="mini" title="删除" type="danger" @click="Deleteintolibraryreceives(scope.row)">删除</el-button> -->
+                        <el-button size="mini" type="primary" title="通过" @click="GoodsReceiveAudit(scope.row,5)" >出库</el-button>
+                        <el-button size="mini" title="拒绝出库" type="danger" @click="GoodsReceiveAudit(scope.row,6)">拒绝出库</el-button>
                     </template>
                     </el-table-column>
                 </el-table>
@@ -926,7 +930,7 @@ export default {
                     { required: true, message: '请输入', trigger: 'blur' },
                 ],
             },
-            typevalue:'',
+            typevalue:-1,
             //领用参数
             ClaimitemVisible:false,
             ClaimitemData:[],
@@ -973,6 +977,8 @@ export default {
             ],
             ApprovalVisible:false,
             ApprovalData:[],
+            Approvalinput:'',
+            receiveStatus:[],
             //shqx
             Auditauthority:false,
             Editpermission:false,
@@ -1050,6 +1056,7 @@ export default {
                     that.userNameData=res.data.data.userNameData;
                     that.groupNameData=res.data.data.groupNameData;
                     that.WarehousingStatusarr=res.data.data.stockStatus;
+                    that.receiveStatus=res.data.data.receiveStatus;
                     // that.groupNameData.unshift(
                     //     {
                     //         id:0,
@@ -1592,7 +1599,8 @@ export default {
         },
         //审核状态切换
         typevaluechange(){
-            this.GoodsReceiveLists()
+            this.ApprovalcurrentPage=1;
+            this.GoodsReceiveLists();
         },
         //领用审核列表
         GoodsReceiveLists(){
@@ -1612,7 +1620,7 @@ export default {
                     pageSize:that.Approvalpagesize,
                     goodsId:0,
                     userLabel:'',
-                    goodsName:'',
+                    goodsName:that.Approvalinput,
                     beginDt:'',
                     endDt:'',
                     groupLabel:'',
@@ -1877,9 +1885,15 @@ export default {
         },
         //审核领用
         GoodsReceiveAudit(row,val){
-            console.log(row+'');
-            console.log(row);
-            
+            var auditDep=0
+            for (let i = 0; i < row.auditPers.length; i++) {
+                if (row.auditPers[i].auditPer==true) {
+                    auditDep=row.auditPers[i].auditDep
+                }
+            }
+            if (auditDep==0) {
+                return this.$message.error('没有审核权限');
+            }
             var url = "/api/PersonnelModule/GoodsReceiveAudit"
             var that = this
             this.$axios({
@@ -1889,7 +1903,7 @@ export default {
                     Authorization: 'Bearer ' +that.token
                 },
                 data:{
-                    label:row+'',
+                    label:row.id+'',
                     auditEnum:val,
                 }
             }).then(function (res) {