物料

.env.development

@@ -1,6 +1,6 @@
 VUE_APP_FILE_API = http://192.168.1.9:9114
 VUE_APP_GRID_API = http://192.168.1.19:9114
-NODE_ENV = development
+NODE_ENV = production
 
 VUE_APP_ENV = development
 outputDir = dist-dev

package.json

@@ -3,13 +3,13 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "abc":"vue-cli-service build",
-    "serve": "vue-cli-service serve --mode development", 
-    "serve:test": "vue-cli-service serve --mode test", 
-    "build": "vue-cli-service build  --mode development", 
-    "build:devs": "vue-cli-service build  --mode devs", 
+    "abc": "vue-cli-service build",
+    "serve": "vue-cli-service serve --mode development",
+    "serve:test": "vue-cli-service serve --mode test",
+    "build": "vue-cli-service build  --mode development",
+    "build:devs": "vue-cli-service build  --mode devs",
     "build:test": "vue-cli-service build  --mode test",
-    "build:next": "vue-cli-service build  --mode production", 
+    "build:next": "vue-cli-service build  --mode production",
     "lint": "vue-cli-service lint",
     "analyz": "vue-cli-service build"
   },
@@ -28,7 +28,7 @@
     "file-saver": "^2.0.5",
     "form-making": "^1.2.10",
     "html2canvas": "^1.0.0-rc.7",
-    "jquery": "^3.6.0",
+    "jquery": "^3.6.4",
     "jquery-ui": "^1.12.1",
     "js-audio-recorder": "^1.0.7",
     "jsplumb": "^2.15.5",

src/config/dev.js

@@ -4,37 +4,50 @@ let devs = {
     BASE_URL:"http://43.138.50.94:9600/", //本地环境
     BASE_API:"http://43.138.50.94:8880/api",//工作流本地环境
     EXCEL_URL:"http://43.138.50.94:7777", //本地excel路径
-    provincialWorkOrderAreafresourceId:'a682dc9f-2fea-11ed-a6ed-02427ba2d388'//通用工单地市
+    provincialWorkOrderAreafresourceId:'a682dc9f-2fea-11ed-a6ed-02427ba2d388',//通用工单地市
+    provincialWorkOrderfresourceId:'08368848-2fde-11ed-a6ed-02427ba2d388',//通用工单省
+    riskMaterialsfresourceId:'c9104902-6575-11ed-8e1e-d6cd97160e00',//风险防控
 }
 let dev = {
     TITLE:'本地环境',
-    BASE_URL:"http://127.0.0.1:8080", //本地环境
+    BASE_URL:"http://192.168.2.188:8080", //本地环境
     BASE_API:"http://43.138.50.94:8880/api",//工作流本地环境
     EXCEL_URL:"http://43.138.50.94:7777", //本地excel路径
-    provincialWorkOrderAreafresourceId:'a682dc9f-2fea-11ed-a6ed-02427ba2d388'//通用工单地市
+    provincialWorkOrderAreafresourceId:'a682dc9f-2fea-11ed-a6ed-02427ba2d388',//通用工单地市
+    provincialWorkOrderfresourceId:'08368848-2fde-11ed-a6ed-02427ba2d388',//通用工单省
+    riskMaterialsfresourceId:'c9104902-6575-11ed-8e1e-d6cd97160e00',//风险防控
 }
 let test = {
     TITLE:'测试环境',
     BASE_URL:"http://10.149.85.91:8000/spfm", //测试环境
     BASE_API:"http://10.149.85.91:8000/api",//工作流测试环境
     EXCEL_URL:"http://10.149.85.91:7777", //测试excel路径
-    provincialWorkOrderAreafresourceId:'33b0af93-b1ce-11ed-be6b-00505687dcd3'//通用工单地市
+    provincialWorkOrderAreafresourceId:'33b0af93-b1ce-11ed-be6b-00505687dcd3',//通用工单地市
+    provincialWorkOrderfresourceId:'4fdbb96e-8bfd-11ed-8988-00505687dcd3',//通用工单省
+    riskMaterialsfresourceId:'3124a2d4-7209-11ed-8d6f-00505687dcd3',//风险防控
 }
 let prod = {
     TITLE:'线上环境',
     BASE_URL:"http://10.230.26.15:8000/mkt", //线上环境
     BASE_API:"http://10.230.26.15:8000/api",//工作流线上环境
-    EXCEL_URL:"http://10.230.26.15:7777" //线上excel路径
+    EXCEL_URL:"http://10.230.26.15:7777", //线上excel路径
+    provincialWorkOrderAreafresourceId:'db26384e-b984-11ed-afb6-e00084564cce',//通用工单地市
+    provincialWorkOrderfresourceId:'9b83efc7-b984-11ed-afb6-e00084564cce',//通用工单省
+    riskMaterialsfresourceId:'canvas',//风险防控
 }
 export const getConfig  = () =>{
     switch(process.env.VUE_APP_ENV){
         case "development":
+            window.sessionStorage.setItem('getConfig',JSON.stringify(dev) )
             return dev;
         case 'test':
+            window.sessionStorage.setItem('getConfig',JSON.stringify(test))
             return test;
         case 'production':
+            window.sessionStorage.setItem('getConfig',JSON.stringify(prod))
             return prod
         case 'devs':
+            window.sessionStorage.setItem('getConfig',JSON.stringify(devs))
             return devs; 
     }
 }

src/pages/main/advertising/contractCap.vue

@@ -293,7 +293,7 @@ export default {
                 method: "post",
                 headers: {
                     "Content-Type": "application/json",
-                    page: '{"pageNo":"' + n + '","pageSize":"10"}'
+                    page: '{"pageNo":"' + n + '","pageSize":"100"}'
                 },
                 data: v
             }).then(res => {

src/pages/main/advertising/materialAppMessage.vue

@@ -36,7 +36,7 @@
 
                     <el-table-column prop="quantity" label="数量">
                     </el-table-column>
-                    <el-table-column prop="settlementAmount" label="结算金额(元,不含税)">
+                    <el-table-column prop="selectedGysPrice" label="结算金额(元,不含税)">
                     </el-table-column>
                 </el-table>
                 <el-pagination class="pageBox" @current-change="currchange" layout="prev, pager, next" background

src/pages/main/advertising/materialApplistatic.vue

@@ -9,15 +9,15 @@
             <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="countyName" label="地市">
+                    <el-table-column prop="regionName" label="地市">
                     </el-table-column>
-                    <el-table-column prop="metirialType" label="物料类型">
+                    <el-table-column prop="metirialName" label="物料名称">
                     </el-table-column>
                     <el-table-column prop="price" label="单价">
                     </el-table-column>
                     <el-table-column prop="size" label="规格">
                     </el-table-column>
-                    <el-table-column prop="priority" label="数量">
+                    <el-table-column prop="coefficient" label="系数">
                     </el-table-column>
 					<el-table-column prop="settlementAmount" label="小计">
                     </el-table-column>
@@ -32,7 +32,8 @@
 
 </template>
 <script>
-    import mySearch from "../../../components/search.vue";
+    import { log } from "console";
+import mySearch from "../../../components/search.vue";
     import toolList from '../../../components/toolList'
 
     export default {
@@ -84,6 +85,7 @@
             },
             //获取列表
             getList(v, n) {
+
                 console.log(v);
                 this.pageSize = n;
                 this.loading = true;
@@ -99,6 +101,9 @@
                 }).then((res) => {
                     console.log(res);
                     this.tableData = res.data.data;
+                    this.tableData.map((item) =>{
+                           item.settlementAmount = item.coefficient*item.price;
+                    })
                     this.allNum = res.data.retMsg;
                     this.total = res.data.totalRecord;
                     this.loading = false;
@@ -120,6 +125,8 @@
             },
         },
         mounted() {
+            console.log(this.$route);
+                console.log(this.$router);
             this.getList({}, 1);
         },
         created() {

src/pages/main/advertising/supplier.vue

@@ -59,7 +59,7 @@
                         </el-form-item>
 						<el-form-item>
                             <span>供应商编码</span>
-                            <el-input v-model="infolist.code" placeholder="供应商编码" ></el-input>
+                            <el-input v-model="infolist.code" placeholder="供应商编码" :disabled="disableStatus"></el-input>
                         </el-form-item>
 						<el-form-item prop="cost">
 						    <span>框架总额</span>
@@ -67,7 +67,7 @@
 						</el-form-item>
                         <el-form-item prop="lastCost">
 						    <span>剩余总额</span>
-						    <el-input v-model="infolist.lastCost" placeholder="剩余总额" :disabled="disableStatus"></el-input>
+						    <el-input v-model="infolist.lastCost" placeholder="剩余总额" :disabled="disablesStatus"></el-input>
 						</el-form-item>
                         <el-form-item prop="schedule">
 						    <span>总额进度</span>
@@ -93,12 +93,12 @@
 						</el-form-item> -->
                         <el-form-item >
 						    <span>预占总额</span>
-						    <el-input v-model="infolist.preCost"  placeholder="预占总额" :disabled="disableStatus">
+						    <el-input v-model="infolist.preCost"  placeholder="预占总额" :disabled="disablesStatus">
 						    </el-input>
 						</el-form-item>
                         <el-form-item >
 						    <span>下单总额</span>
-						    <el-input v-model="infolist.billCost"  placeholder="下单总额" :disabled="disableStatus">
+						    <el-input v-model="infolist.billCost"  placeholder="下单总额" :disabled="disablesStatus">
 						    </el-input>
 						</el-form-item>
                
@@ -204,6 +204,7 @@
             //     }
             // }
             return {
+                disablesStatus:false,
                 rules: {
                     name: [{
                         required: true,
@@ -360,15 +361,18 @@
                 if (v === 1) {
                     this.titname = '查看';
                     this.disableStatus = true;
+                    this.disablesStatus = true;
                     return
                 } else if (v === 2) {
                     this.titname = '修改';
                     this.disableStatus = false;
+                    this.disablesStatus = true;
                     this.supplierNameOrigin = this.infolist.name
 
                 } else if (v === 3) {
                     this.titname = '添加';
                     this.disableStatus = false;
+                    this.disablesStatus = false;
                 }
                 this.infolist.opNo = this.userInfo.loginNo;
                 this.infolist.opName = this.userInfo.loginName;

vue.config.js

@@ -126,14 +126,14 @@ module.exports = {
                     "^/market": "",
                 },
             },
-            "/api": {
-                target: "http://43.138.50.94:7777",
-                ws: false,
-                changeOrigin: true,
-                pathRewrite: {
-                    "^/api": "",
-                },
-            },
+            // "/api": {
+            //     target: "http://43.138.50.94:7777",
+            //     ws: false,
+            //     changeOrigin: true,
+            //     pathRewrite: {
+            //         "^/api": "",
+            //     },
+            // },
             // 开发环境变化可注释 ⬆️⬆️
             "/": {
                 // target: 'http://192.168.2.145:9600/spfm',
@@ -146,12 +146,13 @@ module.exports = {
                 // target: 'http://192.168.2.92:9600/',
                 // target: 'http://192.168.2.124:9600/',
                 // target: "http://124.223.66.248:9600",
-                target: "http://43.138.50.94:9600",
-                // target: 'http://192.168.2.44:9600/',
+                // target: "http://43.138.50.94:9600",
+                target: 'http://192.168.2.124:9600/',
                 // target: 'http://192.168.2.92:9600',
                 // target: "http://124.223.66.248:9600",
                 // target: "http://43.138.50.94:9600",
                 changeOrigin: true,
+                logLevel:'debug',
             },
         },
     },