yangbifan hace 2 años
padre
commit
52d5295d3a
Se han modificado 2 ficheros con 35 adiciones y 21 borrados
  1. 6 7
      public/index.html
  2. 29 14
      src/pages/main/advertising/businessHall.vue

+ 6 - 7
public/index.html

@@ -21,6 +21,7 @@
   <link rel='stylesheet' href='/static/js/luckysheet/assets/iconfont/iconfont.css' />
   <script src="./static/js/base64.min.js"></script>
   <script src="/static/js/ace.js"></script>
+  <!-- <script src="./static/js/jquery-1.8.2.min.js"></script> -->
 </head>
 
 <body>
@@ -30,16 +31,14 @@
   </noscript>
   <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://192.168.0.103:9600/';
+  <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://192.168.2.92:9600';
     // window.staticHost = 'http://43.138.50.94:9600/';
-    // window.staticHost = 'http://192.168.2.43:9600/';
 
     // document.title = "hello";
-  </script> -->
-
+  </script>
 </body>
 
 </html>

+ 29 - 14
src/pages/main/advertising/businessHall.vue

@@ -166,7 +166,7 @@
                         </el-form-item>
                         <el-form-item prop="sceneName">
                             <span>使用场景</span>
-                            <el-select @change="accountcho" :popper-append-to-body="false" v-model="infolist.sceneName"
+                            <el-select @change="accountcho"  v-model="infolist.sceneName"
                                 placeholder="使用场景" :disabled="disableStatus">
                                 <el-option v-for="item in sceneOpt" :key="item.dataCode" :label="item.dataName"
                                     :value="item.dataName">
@@ -194,12 +194,12 @@
                             <span>物料编码</span>
                             <el-input v-model="infolist.metirialCode" disabled></el-input>
                         </el-form-item>
-                        <el-form-item prop="metirialName">
+                        <el-form-item >
                             <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 metirialOpt" :key="index" :label="item.metirialName"
-                                    :value="item.metirialName">
+                            <el-select :disabled="disableStatus" v-model="infolist.metirialName" placeholder="物料名称"
+                                @change="materialNameChange">
+                                <el-option v-for="(item, index) in metirialOpt" :key="index" :label="item.metirialNames"
+                                    :value="item.metirialNames">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -216,12 +216,14 @@
                             infolist.unit == '延长米'
                         ">
                             <span>长(米)</span>
-                            <el-input oninput="value = parseInt(value) || ''"  v-model="infolist.length" placeholder="长" :disabled="disableStatus">
+                            <el-input oninput="value = parseInt(value) || ''" v-model="infolist.length" placeholder="长"
+                                :disabled="disableStatus">
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="width" v-if="infolist.unit == '平方米'">
                             <span>宽(米)</span>
-                            <el-input oninput="value = parseInt(value) ||''" v-model="infolist.width" placeholder="宽" :disabled="disableStatus">
+                            <el-input oninput="value = parseInt(value) ||''" v-model="infolist.width" placeholder="宽"
+                                :disabled="disableStatus">
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="direction">
@@ -276,13 +278,14 @@
 
         <myMessage :messTit="messTit" @closeMessage="closeMessage" :centerDialogVisible="centerDialogVisible"
             v-if="centerDialogVisible"></myMessage>
-</fullscreen>
+    </fullscreen>
 </template>
 <script>
 import mySearch from "../../../components/search.vue";
 import myMessage from "../../../components/myMessage.vue";
 import toolList from "../../../components/toolList";
 import myUpload from "../../../components/upload.vue";
+import { log } from "console";
 
 export default {
     components: {
@@ -732,8 +735,15 @@ export default {
             // return this.infolist.settlementAmount
         },
         accountcho(v) {
-            this.infolist.metirialName = ''
+            this.metirialOpt = []
+            // console.log('出发bug');
+            // console.log(this.infolist);
+            if(this.infolist.metirialName){
+                this.infolist.metirialName = "";
+            }
             
+            // console.log(this.infolist);
+
             //   this.account = v;
             //   let x = v;
             //   if (v == "营业厅-VI改造" || v == "营业厅-常规物料") {
@@ -769,11 +779,13 @@ export default {
         //   }
         // },
         materialNameChange(v) {
+                  
             this.metirialInfoSingle = this.materialNameopt.filter(item => {
                 return item.metirialName == v;
             });
+           console.log(this.metirialInfoSingle);
             this.infolist.metirialCode = this.metirialInfoSingle[0].metirialCode;
-            this.infolist.size = this.metirialInfoSingle[0].size;
+            // this.infolist.size = this.metirialInfoSingle[0].size;
             this.infolist.unit = this.metirialInfoSingle[0].unit;
 
             if (this.metirialInfoSingle[0].coefficient == "1") {
@@ -783,7 +795,10 @@ export default {
                 this.quantityDisabled = false;
                 this.$set(this.infolist, "quantity", "");
             }
-            this.infolist.price = this.metirialInfoSingle[0].price;
+            // this.infolist.price = this.metirialInfoSingle[0].price;
+            // this.infolist.metirialName = this.metirialInfoSingle[0].metirialNames;
+            // console.log(this.metirialInfoSingle[0].metirialName);
+            // console.log(this.infolist);
         },
         // advancecheck() {
         //   this.num = this.infolist.price * this.infolist.conversion;
@@ -795,14 +810,14 @@ export default {
         },
         //搜索数据
         searchInfo(v) {
+            console.log(v);
             this.params = {};
             v[0] ? (this.params.regionName = v[0]) : "";
             v[1] ? (this.params.countyName = v[1]) : "";
             v[2] ? (this.params.channelName = v[2]) : "";
             v[3] ? (this.params.sceneName = v[3]) : "";
             //新增物料类别和物料名称模糊查询
-            v[4] ? (this.params.metirialType = v[4]) : "";
-            v[5] ? (this.params.metirialName = v[5]) : "";
+            v[4] ? (this.params.metirialName = v[4]) : "";
             this.getList(this.params, this.pageSize);
         },
         //获取列表