yangbifan 2 yıl önce
ebeveyn
işleme
536e6bf2b1

+ 2 - 2
config/dev.env.js

@@ -6,10 +6,10 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
   ctx:'"http://192.168.2.188:8080"',
-  // ctxForm: '"http://10.149.85.91:8000/api"',//dev
+  ctxForm: '"http://10.149.85.91:8000/api"',//dev
   // ctxForm: '"http://43.138.50.94:8880"',//test
   // ctxForm: '"http://192.168.2.44:8880"',//test
-  ctxForm: '"http://10.230.26.15:8000/api"',//生产
+  // ctxForm: '"http://10.230.26.15:8000/api"',//生产
 
   excludeMeWhenSelectNextHandler:false,
   excludeFormerHanlder:false,

+ 2 - 2
public/index.html

@@ -31,8 +31,8 @@
   <div id="app"></div>
   <!-- built files will be auto injected -->
   <script type="text/javascript">
-    window.staticHost = 'http://10.230.26.15:8000/mkt'; // 正式
-    // window.staticHost = 'http://10.149.85.91:8000/spfm'; // 测试
+    // window.staticHost = 'http://10.230.26.15:8000/mkt'; // 正式
+    window.staticHost = 'http://10.149.85.91:8000/spfm'; // 测试
     // window.staticHost = 'http://192.168.0.103:9600/';
     // window.staticHost = 'http://43.138.50.94:9600/';
 

+ 21 - 213
src/pages/main/advertising/materialAppMessage.vue

@@ -10,35 +10,33 @@
             <div class="tabbox">
                 <el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
                     tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading">
-                    <el-table-column prop="sceneName" label="城市">
+                    <el-table-column prop="region" label="城市">
                     </el-table-column>
-                    <el-table-column prop="proviceFlagName" label="区县">
+                    <el-table-column prop="district" label="区县">
                     </el-table-column>
 
-                    <el-table-column prop="metirialCode" label="供应商(全称)">
+                    <el-table-column prop="selectedGys" label="供应商(全称)">
                     </el-table-column>
-                    <el-table-column prop="metirialName" label="使用场景">
+                    <el-table-column prop="useCase" label="使用场景">
                     </el-table-column>
-                    <el-table-column prop="unit" label="物料编码">
+                    <el-table-column prop="materialNo" label="物料编码">
                     </el-table-column>
-                    <el-table-column prop="price" label="物料名称">
+                    <el-table-column prop="material" label="物料名称">
                     </el-table-column>
                     <el-table-column prop="unit" label="物料单位">
                     </el-table-column>
-                    <el-table-column prop="unit" label="物料编码">
+                    <el-table-column prop="spec" label="规格尺寸">
                     </el-table-column>
-                    <el-table-column prop="unit" label="规格尺寸">
+                    <el-table-column prop="chang" label="长(M)">
                     </el-table-column>
-                    <el-table-column prop="unit" label="长(M)">
+                    <el-table-column prop="kuan" label="宽(M)">
                     </el-table-column>
-                    <el-table-column prop="unit" label="宽(M)">
-                    </el-table-column>
-                    <el-table-column prop="unit" label="系数">
+                    <el-table-column prop="coefficient" label="系数">
                     </el-table-column>
 
-                    <el-table-column prop="unit" label="数量">
+                    <el-table-column prop="quantity" label="数量">
                     </el-table-column>
-                    <el-table-column prop="unit" label="结算金额(元,不含税)">
+                    <el-table-column prop="settlementAmount" label="结算金额(元,不含税)">
                     </el-table-column>
                 </el-table>
                 <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
@@ -58,198 +56,8 @@ export default {
         toolList,
     },
     data() {
-        const sceneName = (rule, value, callback) => {
-            if (!this.infolist.sceneName) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const metirialName = (rule, value, callback) => {
-            if (!this.infolist.metirialName) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const metirialType = (rule, value, callback) => {
-            if (!this.infolist.metirialType) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const isAsic = (rule, value, callback) => {
-            if (!this.infolist.isAsic) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const metirialCode = (rule, value, callback) => {
-            if (!this.infolist.metirialCode) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const proviceFlag = (rule, value, callback) => {
-            if (!this.infolist.proviceFlag) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const proviceFlagName = (rule, value, callback) => {
-            if (!this.infolist.proviceFlagName) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-
-        const supplierCode = (rule, value, callback) => {
-            if (!this.infolist.supplierCode) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const size = (rule, value, callback) => {
-            if (!this.infolist.size) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const coefficient = (rule, value, callback) => {
-            if (!this.infolist.coefficient) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const unit = (rule, value, callback) => {
-            if (!this.infolist.unit) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-
-        const price = (rule, value, callback) => {
-            if (!this.infolist.price) {
-                callback(new Error("不能为空"));
-            } else if (parseFloat(this.infolist.price) > 999999.99) {
-                callback(new Error("数量过大"));
-            } else {
-                callback();
-            }
-        };
-        const quality = (rule, value, callback) => {
-            if (!this.infolist.quality) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
+       
         return {
-            rules: {
-                sceneName: [
-                    {
-                        required: true,
-                        trigger: "change",
-                        validator: sceneName
-                    }
-                ],
-                metirialName: [
-                    {
-                        required: true,
-                        trigger: "change",
-                        validator: metirialName
-                    }
-                ],
-                metirialType: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        validator: metirialType
-                    }
-                ],
-                isAsic: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        validator: isAsic
-                    }
-                ],
-
-                metirialCode: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        validator: metirialCode
-                    }
-                ],
-                proviceFlag: [
-                    {
-                        required: true,
-                        trigger: "change",
-                        validator: proviceFlag
-                    }
-                ],
-                proviceFlagName: [
-                    {
-                        required: true,
-                        trigger: "change",
-                        validator: proviceFlagName
-                    }
-                ],
-
-                supplierCode: [
-                    {
-                        required: true,
-                        trigger: "change",
-                        validator: supplierCode
-                    }
-                ],
-                size: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        validator: size
-                    }
-                ],
-                coefficient: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        validator: coefficient
-                    }
-                ],
-
-                unit: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        validator: unit
-                    }
-                ],
-                price: [
-                    {
-                        required: true,
-                        trigger: "change",
-                        validator: price
-                    }
-                ],
-                quality: [
-                    {
-                        required: true,
-                        trigger: "change",
-                        validator: quality
-                    }
-                ]
-            },
             searchList: [
                 {
                     type: "sel",
@@ -402,16 +210,15 @@ export default {
     methods: {
         exportTempletelist() {
             let data = this.params;
-            console.log(data);
             // return
             this.$http({
-                url: "/market/cadvSecbuyMetirial/excelExportTemplete",
+                url: "/market/xcwlProcess/excelExportFeeDetail",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
                 },
                 responseType: "blob",
-                data: data,
+                data: {},
             }).then((response) => {
                 if (window.navigator && window.navigator.msSaveOrOpenBlob) {
                     let blob = new Blob([response.data], {
@@ -444,10 +251,11 @@ export default {
         //搜索数据
         searchInfo(v) {
             this.params = {};
-            v[0] ? (this.params.sceneName = v[0]) : "";
-            v[1] ? (this.params.proviceFlagName = v[1]) : "";
-            v[2] ? (this.params.metirialName = v[2]) : "";
-            v[3] ? (this.params.metirialCode = v[3]) : "";
+            v[0] ? (this.params.useCase = v[0]) : "";
+            v[1] ? (this.params.selectedGys = v[1]) : "";
+            v[2] ? (this.params.region = v[2]) : "";
+            v[3] ? (this.params.district = v[3]) : "";
+            v[4] ? (this.params.materialNo = v[4]) : "";
             this.getList(this.params, this.pageSize);
         },
         uploadBack(v) {
@@ -495,7 +303,7 @@ export default {
             this.loading = true;
             this.tableData = [];
             this.$http({
-                url: "/market/cadvSecbuyMetirial/queryPage",
+                url: "/market/xcwlProcess/queryDonePage",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",

+ 26 - 210
src/pages/main/advertising/materialAppNum.vue

@@ -9,27 +9,25 @@
             </div>
             <div class="tabbox">
                 <el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
-                    tooltip-effect="dark" size="small" border style="width: 100%" @selection-change="handleSelectionChange"
+                    tooltip-effect="dark" size="small" border style="width: 100%" @selection-change="selectionChange"
                     v-loading="loading">
                     <el-table-column type="selection" width="55">
                     </el-table-column>
-                    <el-table-column prop="sceneName" label="业务名称">
+                    <el-table-column prop="needName" label="业务名称">
                     </el-table-column>
-                    <el-table-column prop="proviceFlagName" label="需求编号">
+                    <el-table-column prop="state" label="需求编号">
                     </el-table-column>
-                    <el-table-column prop="unit" label="物料编码">
+                    <el-table-column prop="materialNo" label="物料编码">
                     </el-table-column>
-                    <el-table-column prop="price" label="物料名称">
+                    <el-table-column prop="material" label="物料名称">
                     </el-table-column>
                     <el-table-column prop="unit" label="物料单位">
                     </el-table-column>
-                    <el-table-column prop="unit" label="物料编码">
+                    <el-table-column prop="spec" label="规格尺寸">
                     </el-table-column>
-                    <el-table-column prop="unit" label="规格尺寸">
+                    <el-table-column prop="quantity" label="数量">
                     </el-table-column>
-                    <el-table-column prop="unit" label="数量">
-                    </el-table-column>
-                    <el-table-column prop="unit" label="区县验收打分">
+                    <el-table-column prop="districtScore" label="区县验收打分">
                     </el-table-column>
                 </el-table>
                 <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
@@ -40,6 +38,7 @@
 </fullscreen>
 </template>
 <script>
+import { log } from "console";
 import mySearch from "../../../components/search.vue";
 import toolList from "../../../components/toolList";
 
@@ -49,198 +48,10 @@ export default {
         toolList,
     },
     data() {
-        const sceneName = (rule, value, callback) => {
-            if (!this.infolist.sceneName) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const metirialName = (rule, value, callback) => {
-            if (!this.infolist.metirialName) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const metirialType = (rule, value, callback) => {
-            if (!this.infolist.metirialType) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const isAsic = (rule, value, callback) => {
-            if (!this.infolist.isAsic) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const metirialCode = (rule, value, callback) => {
-            if (!this.infolist.metirialCode) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const proviceFlag = (rule, value, callback) => {
-            if (!this.infolist.proviceFlag) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const proviceFlagName = (rule, value, callback) => {
-            if (!this.infolist.proviceFlagName) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
 
-        const supplierCode = (rule, value, callback) => {
-            if (!this.infolist.supplierCode) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const size = (rule, value, callback) => {
-            if (!this.infolist.size) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const coefficient = (rule, value, callback) => {
-            if (!this.infolist.coefficient) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
-        const unit = (rule, value, callback) => {
-            if (!this.infolist.unit) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
 
-        const price = (rule, value, callback) => {
-            if (!this.infolist.price) {
-                callback(new Error("不能为空"));
-            } else if (parseFloat(this.infolist.price) > 999999.99) {
-                callback(new Error("数量过大"));
-            } else {
-                callback();
-            }
-        };
-        const quality = (rule, value, callback) => {
-            if (!this.infolist.quality) {
-                callback(new Error("不能为空"));
-            } else {
-                callback();
-            }
-        };
         return {
-            rules: {
-                sceneName: [
-                    {
-                        required: true,
-                        trigger: "change",
-                        validator: sceneName
-                    }
-                ],
-                metirialName: [
-                    {
-                        required: true,
-                        trigger: "change",
-                        validator: metirialName
-                    }
-                ],
-                metirialType: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        validator: metirialType
-                    }
-                ],
-                isAsic: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        validator: isAsic
-                    }
-                ],
-
-                metirialCode: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        validator: metirialCode
-                    }
-                ],
-                proviceFlag: [
-                    {
-                        required: true,
-                        trigger: "change",
-                        validator: proviceFlag
-                    }
-                ],
-                proviceFlagName: [
-                    {
-                        required: true,
-                        trigger: "change",
-                        validator: proviceFlagName
-                    }
-                ],
-
-                supplierCode: [
-                    {
-                        required: true,
-                        trigger: "change",
-                        validator: supplierCode
-                    }
-                ],
-                size: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        validator: size
-                    }
-                ],
-                coefficient: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        validator: coefficient
-                    }
-                ],
-
-                unit: [
-                    {
-                        required: true,
-                        trigger: "blur",
-                        validator: unit
-                    }
-                ],
-                price: [
-                    {
-                        required: true,
-                        trigger: "change",
-                        validator: price
-                    }
-                ],
-                quality: [
-                    {
-                        required: true,
-                        trigger: "change",
-                        validator: quality
-                    }
-                ]
-            },
+            exportList:[],
             searchList: [
 
                 { type: "input", tit: "供应商", value: "", width: "31%" },
@@ -294,7 +105,7 @@ export default {
                     dataCode: "7",
                     dataName: "政企"
                 }
-            ], 
+            ],
             // 基础数据
             isAsicopt: [
                 {
@@ -356,18 +167,23 @@ export default {
         };
     },
     methods: {
+        selectionChange(val){
+          this.exportList =  val;
+        },  
         exportTempletelist() {
-            let data = this.params;
-            console.log(data);
+            if(this.exportList.length==0){
+                this.$message.error('请选择导出文件')
+                return
+            }
             // return
             this.$http({
-                url: "/market/cadvSecbuyMetirial/excelExportTemplete",
+                url: "/market/xcwlProcess/excelExportDistrictScore",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
                 },
                 responseType: "blob",
-                data: data,
+                data: this.exportList,
             }).then((response) => {
                 if (window.navigator && window.navigator.msSaveOrOpenBlob) {
                     let blob = new Blob([response.data], {
@@ -400,10 +216,10 @@ export default {
         //搜索数据
         searchInfo(v) {
             this.params = {};
-            v[0] ? (this.params.sceneName = v[0]) : "";
-            v[1] ? (this.params.proviceFlagName = v[1]) : "";
-            v[2] ? (this.params.metirialName = v[2]) : "";
-            v[3] ? (this.params.metirialCode = v[3]) : "";
+            v[0] ? (this.params.selectedGys = v[0]) : "";
+            v[1] ? (this.params.region = v[1]) : "";
+            v[2] ? (this.params.district = v[2]) : "";
+            v[3] ? (this.params.materialNo = v[3]) : "";
             this.getList(this.params, this.pageSize);
         },
         uploadBack(v) {
@@ -451,7 +267,7 @@ export default {
             this.loading = true;
             this.tableData = [];
             this.$http({
-                url: "/market/cadvSecbuyMetirial/queryPage",
+                url: "/market/xcwlProcess/queryDonePage",
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
@@ -501,7 +317,7 @@ export default {
                 this.suppOpt = res.data;
             });
         },
-        handleSelectionChange(){
+        handleSelectionChange() {
 
         }
     },

+ 28 - 24
src/pages/main/advertising/materialApplistatic.vue

@@ -4,22 +4,22 @@
             <toolList @iconCli='iconCli' :tooltit='tooltit'></toolList>
             <div class="search">
                 <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
-				<span class="allprice">合计总额:3000</span>
+				<span class="allprice">合计总额:{{ allNum }}</span>
             </div>
             <div class="tabbox">
                 <el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
                     tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading">
-                    <el-table-column prop="name" label="地市">
+                    <el-table-column prop="countyName" label="地市">
                     </el-table-column>
-                    <el-table-column prop="type" label="物料类型">
+                    <el-table-column prop="metirialType" label="物料类型">
                     </el-table-column>
-                    <el-table-column prop="money" label="单价">
+                    <el-table-column prop="price" label="单价">
                     </el-table-column>
                     <el-table-column prop="size" label="规格">
                     </el-table-column>
-                    <el-table-column prop="num" label="数量">
+                    <el-table-column prop="priority" label="数量">
                     </el-table-column>
-					<el-table-column prop="all" label="小计">
+					<el-table-column prop="settlementAmount" label="小计">
                     </el-table-column>
                 </el-table>
                 <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background
@@ -42,6 +42,8 @@
         },
         data() {
             return {
+                allNum:'',
+                params:{},
                 searchList: [
                     {
                         type: 'input',
@@ -82,23 +84,25 @@
             },
             //获取列表
             getList(v, n) {
-                // this.pageSize = n;
-                // let _this = this;
-                // this.loading = true;
-                // this.tableData = [];
-                // this.$http({
-                //     url: "/bpm/api/queryBpmPrePluginPage",
-                //     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.loading = false;
-                // });
+                console.log(v);
+                this.pageSize = n;
+                this.loading = true;
+                this.tableData = [];
+                this.$http({
+                    url: "/market/cadvBusiMetirial/queryPageReport",
+                    method: "post",
+                    headers: {
+                        "Content-Type": "application/json",
+                        "page": '{"pageNo":"' + n + '","pageSize":"10"}'
+                    },
+                    data: v,
+                }).then((res) => {
+                    console.log(res);
+                    this.tableData = res.data.data;
+                    this.allNum = res.data.retMsg;
+                    this.total = res.data.totalRecord;
+                    this.loading = false;
+                });
             },
             // 分页
             currchange(v) {
@@ -116,7 +120,7 @@
             },
         },
         mounted() {
-            // this.getList({}, 1);
+            this.getList({}, 1);
         },
         created() {