adver

config/dev.env.js

@@ -6,8 +6,8 @@ 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://43.138.50.94:8880/api"',//test
+  ctxForm: '"http://10.149.85.91:8000/api"',//dev
+  // ctxForm: '"http://43.138.50.94:8880/api"',//test
   // ctxForm: '"http://192.168.2.44:8880"',//test
   // ctxForm: '"http://10.230.26.15:8000/api"',//生产
 

public/index.html

@@ -32,9 +32,9 @@
   <!-- 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.149.85.91:8000/spfm'; // 测试
     // window.staticHost = 'http://192.168.0.103:9600/';
-    window.staticHost = 'http://43.138.50.94:9600/';
+    // window.staticHost = 'http://43.138.50.94:9600/';
 
     // document.title = "hello";
   </script>

src/pages/main/advertising/businessHall.vue

@@ -17,8 +17,8 @@
                     userInfo.countyName != null || userInfo.cityName != null
                 ">添加
                 </el-button> -->
-                <el-button class="btn-check" size="medium" type="primary" @click="dialogCheck(3)" >添加
-                </el-button>
+                <!-- <el-button class="btn-check" size="medium" type="primary" @click="dialogCheck(3)" >添加
+                </el-button> -->
             </div>
             <div class="search">
                 <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch>
@@ -28,7 +28,7 @@
                 </el-button>
             </div>
             <div class="tabbox">
-                <el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
+                <el-table height="calc(100% - 100px)" class="com-table" ref="multipleTable" :data="tableData"
                     tooltip-effect="dark" size="small" border style="width: 100%" v-loading="loading">
                     <el-table-column prop="regionName" label="公司">
                     </el-table-column>
@@ -198,7 +198,7 @@
                             <span>物料名称</span>
                             <el-select :disabled="disableStatus" :popper-append-to-body="false"
                                 v-model="infolist.metirialName" placeholder="物料名称" @change="materialNameChange">
-                                <el-option v-for="(item, index) in materialNameopt" :key="index" :label="item.metirialName"
+                                <el-option v-for="(item, index) in metirialOpt" :key="index" :label="item.metirialName"
                                     :value="item.metirialName">
                                 </el-option>
                             </el-select>
@@ -732,6 +732,8 @@ export default {
             // return this.infolist.settlementAmount
         },
         accountcho(v) {
+            this.infolist.metirialName = ''
+            
             //   this.account = v;
             //   let x = v;
             //   if (v == "营业厅-VI改造" || v == "营业厅-常规物料") {

src/pages/main/advertising/contractCap.vue

@@ -134,7 +134,7 @@
         </el-dialog>
         <myMessage :messTit="messTit" @closeMessage="closeMessage" :centerDialogVisible="centerDialogVisible"
             v-if="centerDialogVisible"></myMessage>
-</fullscreen>
+    </fullscreen>
 </template>
 <script>
 import mySearch from "../../../components/search.vue";
@@ -243,14 +243,14 @@ export default {
     },
     computed: {
 
-            secbuySchedule: function() {
-                this.infolist.secbuySchedule = (this.infolist.secbuyPreAccount - this.infolist.secbuyLastAccount) / this.infolist.secbuyPreAccount;
-                this.infolist.secbuySchedule = ((parseFloat(this.infolist.secbuySchedule)*100).toFixed(2));
-                if(isNaN(this.infolist.secbuySchedule)){
-                    this.infolist.secbuySchedule = ''
-                }
-                return this.infolist.secbuySchedule;
+        secbuySchedule: function () {
+            this.infolist.secbuySchedule = (this.infolist.secbuyPreAccount - this.infolist.secbuyLastAccount) / this.infolist.secbuyPreAccount;
+            this.infolist.secbuySchedule = ((parseFloat(this.infolist.secbuySchedule) * 100).toFixed(2));
+            if (isNaN(this.infolist.secbuySchedule)) {
+                this.infolist.secbuySchedule = ''
             }
+            return this.infolist.secbuySchedule;
+        }
     },
     methods: {
         closedia() {
@@ -387,13 +387,13 @@ export default {
             }
         },
         submitInfo(u) {
-            // callback(new Error('不能为空'))
-            // if (
-            //     this.infolist.secbuyPreAccount <=
-            //     this.infolist.secbuyLastAccount
-            // ) {
-            //     new Error("二采预算总额应大于二采剩余预算");
-            // }
+            if (
+                parseInt(this.infolist.secbuyPreAccount) <=
+                parseInt(this.infolist.costAccount)
+            ) {
+                this.$message.error('二采预算总额应大于二采剩余预算')
+                return;
+            }
 
             let _this = this;
             this.$refs.infolist.validate(valid => {
@@ -543,7 +543,7 @@ export default {
     watch: {
         "infolist.secbuyPreAccount": {
             handler(newVal) {
-                  this.infolist.secbuyLastAccount =  newVal -  this.infolist.costAccount
+                this.infolist.secbuyLastAccount = newVal - this.infolist.costAccount
             },
         },
     }