03181710

src/components/OP/EntryQuotation.vue

@@ -1,5 +1,15 @@
 <template>
     <div class="entryquotation-all">
+        <div class="entryquotation-head">
+            <el-select v-model="value" filterable placeholder="请选择">
+                <el-option
+                    v-for="item in options"
+                    :key="item.id"
+                    :label="item.groupName"
+                    :value="item.id">
+                </el-option>
+            </el-select>
+        </div>
         <div class="entryquotation-title">出入境报价表</div>
         <div class="entryquotation-form">
             <div class="entryquotation-form-li" v-for="(item, index) in tabledata" :key="index">
@@ -59,6 +69,10 @@ export default {
         return {
             tabledata: [], // 表格数据
             options: [], // 币种汇率数据
+            value:'',
+            options:[],
+            token:'',
+            userId:'',
         };
     },
     methods: {
@@ -80,11 +94,29 @@ export default {
                 }
             });
         },
-
+        //获取团组
+        GetEnterExitCostDataSource() {
+            var url = "/api/Groups/GetEnterExitCostDataSource";
+            var that = this;
+            this.$axios({
+                method: "post",
+                url: url,
+                headers: { Authorization: "Bearer" },
+                data: { portType: 1 },
+            }).then(function (res) {
+                var Costinfo={}
+                if (res.data.code == 200) {
+                    Costinfo=res.data.data;
+                    that.options=Costinfo.groupNameData;
+                    that.value=that.options[0].id;
+                    that.EnterExitCostQuoteEntryExitCosts();
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            });
+        },
         // 新增一行
         appenditems(item) {
-            console.log(item);
-            
             item.infos.push({
                 currency:'',
                 id:0,
@@ -133,7 +165,9 @@ export default {
         },
     },
     mounted() {
-        this.EnterExitCostQuoteEntryExitCosts(); // 初始化数据
+        this.token = JSON.parse(localStorage.getItem('userinif')).token;
+        this.userId = JSON.parse(localStorage.getItem('userinif')).userInfo.userId;
+        this.GetEnterExitCostDataSource(); // 初始化数据
     },
 };
 </script>

src/components/OP/SuppliesInventory.vue

@@ -1,5 +1,116 @@
 <template>
     <div class="SuppliesInventory-all">
+        <el-dialog top="10vh" width="1200px" title="入库审核" :visible.sync="Warehousingaudit">
+            <div class="warehousingaudit-search">
+                <!-- <div class="warehousingaudit-search-li">
+                    <label>物品类型:</label>
+                    <el-select @change="Warehousingchange" clearable   filterable style="width: 180px;" size="small" v-model="WarehousingTypes" placeholder="请选择">
+                        <el-option
+                          v-for="item in RSAuditTypearr"
+                          :key="item.id"
+                          :label="item.name"
+                          :value="item.id">
+                        </el-option>
+                    </el-select>
+                </div> -->
+                <div class="warehousingaudit-search-li">
+                    <label>审核状态:</label>
+                    <el-select @change="Warehousingchange" style="width: 120px;" size="small" v-model="WarehousingStatus" placeholder="请选择">
+                        <el-option
+                          v-for="item in WarehousingStatusarr"
+                          :key="item.value"
+                          :label="item.text"
+                          :value="item.value">
+                        </el-option>
+                    </el-select>
+                </div>
+                <div class="warehousingaudit-search-li">
+                    <label>物品名称:</label>
+                    <el-input style="width: 160px;" size="small" placeholder="请输入物品名称" v-model="Warehousingname" clearable></el-input>
+                </div>
+                <el-button @click="Warehousingchange" style="margin-left: 10px;" size="small" type="primary">查询</el-button>
+            </div>
+            <div class="warehousingaudit-table">
+                <el-table
+                    height="590px"
+                    :data="WarehousingData"
+                    border
+                    style="width: 100%">
+                    <el-table-column
+                    prop="goodsName"
+                    label="物品名称"
+                    width="200">
+                    </el-table-column>
+                    <el-table-column
+                    prop="quantity"
+                    label="数量"
+                    width="50">
+                    </el-table-column>
+                    <el-table-column
+                    prop="createTime"
+                    label="入库时间"
+                    width="150">
+                    </el-table-column>
+                    <el-table-column
+                    prop="createUserName"
+                    label="入库人"
+                    width="70">
+                    </el-table-column>
+                    <el-table-column
+                    prop="statusDesc"
+                    label="审核情况"
+                    width='200'>
+                    <template slot-scope="scope">
+                        <el-popover
+                        placement="top"
+                        width="450"
+                        trigger="hover">
+                            <!-- {{scope.row.statusDesc}} -->
+                            <span v-html="scope.row.statusDesc"></span>
+                            <span style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden;cursor: pointer;color: #48a2ff;" slot="reference">{{scope.row.statusDesc}}</span>
+                        </el-popover>
+                    </template>
+                    </el-table-column>
+                    <el-table-column
+                    prop="confirmStatusText"
+                    label="审核状态"
+                    width="100">
+                    </el-table-column>
+                    <el-table-column
+                    prop="remark"
+                    label="备注"
+                    width='200'>
+                    <template slot-scope="scope">
+                        <el-popover
+                        placement="top"
+                        width="300"
+                        trigger="hover">
+                            <span v-html="scope.row.remark"></span>
+                            <span style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden;cursor: pointer;color: #48a2ff;" slot="reference">{{scope.row.remark}}</span>
+                        </el-popover>
+                    </template>
+                    </el-table-column>
+                    <el-table-column
+                    label="操作">
+                    <template slot-scope="scope">
+                        <el-button size="mini" type="primary" title="通过" @click="GoodsStorageConfirmStatusChange(scope.row,2)" >通过</el-button>
+                        <el-button size="mini" title="不通过" type="danger" @click="GoodsStorageConfirmStatusChange(scope.row,3)">不通过</el-button>
+                    </template>
+                    </el-table-column>
+                </el-table>
+                <div class="block">
+                    <el-pagination
+                    @size-change="WarehousingSizeChange"
+                    @current-change="WarehousingCurrentChange"
+                    :current-page="WarehousingcurrentPage"
+                    :page-sizes="[10, 15, 20, 40]"
+                    :page-size="Warehousingpagesize"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="Warehousingcount">
+                    </el-pagination>
+                </div>
+            </div>
+        </el-dialog>
         <el-dialog top="10vh" width="1740px" title="领用记录" :visible.sync="ReceiptRecord">
             <div class="ReceiptRecord-search">
                 <div class="ReceiptRecord-search-li">
@@ -610,6 +721,7 @@
             <div>
                 <el-button v-if="Auditauthority" @click="GoodsStorageExcelDownload" type="primary">入库记录导出</el-button>
                 <el-button v-if="Auditauthority" @click="inquireRecords" type="primary">领用记录</el-button>
+                <el-button v-if="Auditauthority" @click="Warehousingwicket" type="primary">入库审核</el-button>
                 <el-button v-if="Auditauthority" @click="GoodsReceiveLists" type="primary">审核</el-button>
                 <el-button v-if="Addpermission" @click="addbtnclick" type="primary">新增物品</el-button>
             </div>
@@ -879,6 +991,16 @@ export default {
             RSAuditcurrentPage:1,
             RSAuditpagesize:10,
             RSAuditcount:0,
+            //入库审核
+            Warehousingaudit:false,
+            WarehousingTypes:'',
+            WarehousingStatus:-1,
+            WarehousingStatusarr:[],
+            Warehousingname:'',
+            WarehousingData:[],
+            WarehousingcurrentPage:1,
+            Warehousingpagesize:10,
+            Warehousingcount:0,
         }
     },
     methods:{
@@ -925,6 +1047,7 @@ export default {
                     that.AddMaterialTypearr=res.data.data.goodsTypeData;
                     that.userNameData=res.data.data.userNameData;
                     that.groupNameData=res.data.data.groupNameData;
+                    that.WarehousingStatusarr=res.data.data.stockStatus;
                     // that.groupNameData.unshift(
                     //     {
                     //         id:0,
@@ -968,6 +1091,41 @@ export default {
             }
             this.MaterialinfoTypes=this.MaterialinfoTypes.substring(0, this.MaterialinfoTypes.length - 1);
         },
+        //入库
+        Warehousingchange(){
+            this.WarehousingcurrentPage=1;
+            this.GoodsStorageList();
+        },
+        //入库审核列表
+        GoodsStorageList(val){
+            var url = "/api/PersonnelModule/GoodsStorageList"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer '+ that.token 
+                },
+                data:{
+                    portType:1,
+                    pageIndex:that.WarehousingcurrentPage,
+                    pageSize:that.Warehousingpagesize,
+                    goodsId:that.WarehousingTypes==""?0:that.WarehousingTypes,
+                    currUserId:that.Userid,
+                    auditLabel:that.WarehousingStatus+'',
+                    goodsName:that.Warehousingname,
+                    batchNo:'',
+                }
+            }).then(function (res) {
+                that.WarehousingData=[];
+                if (res.data.code == 200) {
+                    that.WarehousingData=res.data.data;
+                    that.Warehousingcount=res.data.count;
+                }
+            }).catch(function (error) {
+                that.$message.error("操作错误，联系信息部！");
+            });
+        },
         //add物资类型切换
         AddMaterialTypechange(val){
             if(val==0){
@@ -1074,6 +1232,19 @@ export default {
             this.RSAuditcurrentPage=val;
             this.RecordsGoodsReceiveList(false);
         },
+        WarehousingSizeChange(val) {
+            this.WarehousingcurrentPage=1;
+            this.Warehousingpagesize=val;
+            this.GoodsStorageList();
+        },
+        WarehousingCurrentChange(val) {
+            this.WarehousingcurrentPage=val;
+            this.GoodsStorageList();
+        },
+        Warehousingwicket(){
+            this.Warehousingaudit=true;
+            this.GoodsStorageList();
+        },
         //新增按钮
         addbtnclick(){
             this.ID=0;
@@ -1084,6 +1255,44 @@ export default {
             this.unit="";
             this.AddItemsVisible=true;
         },
+        //入库审核
+        GoodsStorageConfirmStatusChange(val,type){
+            var auditDep=0
+            for (let i = 0; i < val.auditPers.length; i++) {
+                if (val.auditPers[i].auditPer==true) {
+                    auditDep=val.auditPers[i].auditDep
+                }
+            }
+            if (auditDep==0) {
+                return this.$message.error('没有审核权限');
+            }
+            var url = "/api/PersonnelModule/GoodsStorageConfirmStatusChange"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' +that.token
+                },
+                data:{
+                    id:val.id,
+                    auditDep:auditDep,
+                    confirmStatus:type,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.$message({
+                        type: 'success',
+                        message: res.data.msg
+                    });
+                    that.GoodsStorageList();
+                }else{
+                    that.$message.error(res.data.msg);
+                }
+            }).catch(function (error) {
+                that.$message.error("操作错误，联系信息部!");
+            });
+        },
         //编辑
         handleEdit(index,row){
             console.log(row);
@@ -1736,7 +1945,7 @@ export default {
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
     min-height: 830px;
-    min-width: 900px;
+    min-width: 1535px;
 }
 .SuppliesInventory-head{
     display: flex;
@@ -1867,6 +2076,21 @@ export default {
 .ReceiptRecord-search .el-range-editor.el-input__inner{
     margin-bottom:0;
 }
+.warehousingaudit-search{
+    display: flex;
+}
+.warehousingaudit-search-li label{
+    margin-left: 10px;
+}
+.warehousingaudit-search .el-range-editor.el-input__inner{
+    margin-bottom:0;
+}
+.warehousingaudit-table{
+    margin-top: 15px;
+}
+.warehousingaudit-table .block{
+    text-align: center;
+}
 </style>