‘liyuanpeng’ 3 gadi atpakaļ
vecāks
revīzija
0d7893df13

+ 10 - 8
src/pages/main/advReleaseAppro/advgys.vue

@@ -18,10 +18,14 @@
                     </el-table-column>
 					<el-table-column prop="frameSum" label="框架总额">
                     </el-table-column>
-					<el-table-column prop="surplusSum" label="剩余额">
+					<el-table-column prop="surplusSum" label="预算剩余额">
 					</el-table-column>
 					<el-table-column prop="taxRate" label="合同税率">
 					</el-table-column>
+                    <el-table-column prop="frameSurplusSum" label="框架剩余总额">
+					</el-table-column>
+					<el-table-column prop="budgetSum" label="预算总额">
+					</el-table-column>
 					<el-table-column prop="endTime" label="截止时间">
 					</el-table-column>
 					<el-table-column prop="homeLocation" label="归属地">
@@ -34,9 +38,9 @@
                         </template>
                     </el-table-column>
                 </el-table>
-                <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
+                <!-- <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
                     :total="total">
-                </el-pagination>
+                </el-pagination> -->
             </div>
         </div>
 
@@ -51,7 +55,7 @@
                         </el-form-item>
 						<el-form-item>
                             <span>供应商编码</span>
-                            <el-input v-model="infolist.supplierCode" placeholder="供应商编码" :disabled="disableStatus"></el-input>
+                            <el-input v-model="infolist.supplierCode" placeholder="合同编码" :disabled="disableStatus"></el-input>
                         </el-form-item>
 						<el-form-item>
 						    <span>框架总额</span>
@@ -164,16 +168,14 @@
                 this.loading = true;
                 this.tableData = [];
                 this.$http({
-                    url: "/market/cAdvPubSupplier/queryPage",
+                    url: "/market/cadvLedger/querySupplierList",
                     method: "post",
                     headers: {
                         "Content-Type": "application/json",
-                        "page": '{"pageNo":"' + n + '","pageSize":"10"}'
                     },
                     data: v,
                 }).then((res) => {
-                    this.tableData = res.data.data;
-                    this.total = res.data.totalRecord;
+                    this.tableData = res.data;
                     this.loading = false;
                 });
             },

+ 10 - 6
src/pages/main/advReleaseAppro/index.vue

@@ -4,8 +4,8 @@
             <toolList @iconCli='iconCli' :tooltit='tooltit'></toolList>
             <div style="overflow: hidden;">
                 <el-button style="float: right;margin-top: 10px;" type="primary" @click="dialogCheck(3)">添加</el-button>
-                <el-button style="float: right;margin-top: 10px;margin-right: 20px;" type="primary"
-                    @click="getStanding(1)">供应商管理</el-button>
+               <!-- <el-button style="float: right;margin-top: 10px;margin-right: 20px;" type="primary"
+                    @click="getStanding(1)">供应商管理</el-button> -->
                 <el-button style="float: right;margin-top: 10px;margin-right: 10px;" type="primary"
                     @click="getStanding(2)">预算及上限</el-button>
             </div>
@@ -231,12 +231,16 @@
                 </el-table-column>
                 <el-table-column prop="frameSum" label="框架总额">
                 </el-table-column>
-                <el-table-column prop="surplusSum" label="剩余额">
+                <el-table-column prop="surplusSum" label="预算剩余额">
                 </el-table-column>
                 <el-table-column prop="taxRate" label="合同税率">
                 </el-table-column>
                 <el-table-column prop="endTime" label="截止时间">
                 </el-table-column>
+                <el-table-column prop="frameSurplusSum" label="框架剩余总额">
+                </el-table-column>
+                <el-table-column prop="budgetSum" label="预算总额">
+                </el-table-column>
             </el-table>
             <div class="t-footer" style="text-align: right;margin-top: 20px;">
                 <el-button type="primary" @click="suppliercheck(1)">确 定</el-button>
@@ -445,7 +449,7 @@
             chosegys() {
                 this.suppliersts = true;
                 this.$http({
-                    url: "/market/cAdvPubSupplier/queryPage",
+                    url: "/market/cadvLedger/querySupplierList",
                     method: "post",
                     headers: {
                         "Content-Type": "application/json",
@@ -453,10 +457,10 @@
                     },
                     data: {},
                 }).then((res) => {
-                    res.data.data.forEach(item => {
+                    res.data.forEach(item => {
                         item.sts = false;
                     })
-                    this.suppList = res.data.data;
+                    this.suppList = res.data;
                 });
             },
             //选择供应商

+ 39 - 9
src/pages/main/violatPunish/checkunderway.vue

@@ -28,6 +28,8 @@
                     </el-button>
                     <el-button v-if="level == 1" size="medium" type="primary" @click="xiazai" style="margin-left: 20px;">下载模板
                     </el-button>
+                    <el-button v-if="level == 1" size="medium" type="danger" @click="delinfos" style="margin-left: 20px;">批量删除
+                    </el-button>
                 </span>
 
 
@@ -42,10 +44,10 @@
             </div>
 
 
-            <div class="tabbox zdy">
-                <el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" tooltip-effect="dark"
+            <div class="tabbox zdy" v-loading='loading'>
+                <el-table v-if="!loading" height="calc(100% - 40px)" class="com-table" ref="multipleTable" tooltip-effect="dark"
                     :data="tableData" size="mini" border style="width: 100%" @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" width="55" align="center" v-if="level == 3">
+                    <el-table-column type="selection" width="55" align="center" v-if="level == 3||level == 1">
                     </el-table-column>
                     <el-table-column :prop="item.name" :label="item.name" v-for="item in tableDatacs">
                         <template slot-scope="scope">
@@ -260,7 +262,7 @@
                 leaderList:[],
                 treeListonlyl:{},
                 numl:0,
-                companyFlag:''
+                companyFlag:'',
             }
         },
         methods: {
@@ -573,6 +575,35 @@
                     this.getList({}, this.pageSize);
                 });
             },
+            delinfos(){
+                let params = [];
+                let _this = this;
+                for (let i = 0; i < this.rowIdList.length; i++) {
+                    params.push({rowId:this.rowIdList[i]})
+                }
+                this.$http({
+                    url: "/market/cIllegalCallTaskRow/delBatch",
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                    },
+                    data: params,
+                }).then((res) => {
+                    if (res.data.result === 1) {
+                        this.$message({
+                            message: res.data.desc,
+                            type: 'error'
+                        });
+                    } else {
+                        this.$message({
+                            message: '成功',
+                            type: 'success'
+                        });
+                        _this.rowIdList = [];
+                        _this.getList({}, 1);
+                    }
+                });
+            },
             handleSelectionChange(v) {
                 this.rowIdList = [];
                 for (let i = 0; i < v.length; i++) {
@@ -745,8 +776,7 @@
             getList(v, n) {
                 this.pageSize = n;
                 let _this = this;
-                this.loading = true;
-                this.tableData = [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}];
+                this.tableData = [];
                 // v.sts = 0;
                 v.missionId = this.$route.query.id.split(",")[2];
                 let url = '';
@@ -765,7 +795,6 @@
                     },
                     data: v,
                 }).then((res) => {
-                    this.tableData = [];
                     res.data.data.forEach(item => {
                         let x = JSON.parse(item.fillContent);
                         x.rowId = item.rowId;
@@ -793,6 +822,7 @@
                 }
             },
             getUser() {
+                this.loading = true;
                 this.userInfo = JSON.parse(window.sessionStorage.userInfo);
                 this.fileInfot.taskId = this.$route.query.id.split(",")[1];
                 this.fileInfot.tempId = this.$route.query.id.split(",")[0];
@@ -825,10 +855,10 @@
             }
         },
         mounted() {
-            this.getUser();
+
         },
         created() {
-
+            this.getUser();
         }
     }
 </script>