Merge branch 'adver' into 'master-copy'

Adver

See merge request spfm/spfm-market-front!442

src/pages/main/advertising/businessHall.vue

@@ -5,14 +5,20 @@
             <div class="search" style="justify-content: flex-start;">
                 <el-button class="btn-check" size="medium" type="primary" @click="outlist">导出
                 </el-button>
-                <el-button class="btn-check" size="medium" type="primary" @click="exportTempletelist">下载导入模板
+                <el-button v-if="
+                    userInfo.countyName != null || userInfo.cityName != null
+                " class="btn-check" size="medium" type="primary" @click="exportTempletelist">下载导入模板
                 </el-button>
-                <myUpload style="display:inline-block;" :fileInfo="fileInfot" :fileList="fileInfot.fileList"
+                <myUpload v-if="
+                    userInfo.countyName != null || userInfo.cityName != null
+                " style="display:inline-block;" :fileInfo="fileInfot" :fileList="fileInfot.fileList"
                     @uploadBack='uploadBack'></myUpload>
-                <el-button class="btn-check" size="medium" type="primary" @click="dialogCheck(3)" v-if="
+                <!-- <el-button class="btn-check" size="medium" type="primary" @click="dialogCheck(3)" v-if="
                     userInfo.countyName != null || userInfo.cityName != null
                 ">添加
-                </el-button>
+                </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>
@@ -22,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>
@@ -192,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>
@@ -210,12 +216,12 @@
                             infolist.unit == '延长米'
                         ">
                             <span>长(米)</span>
-                            <el-input type="number" 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 type="number" 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">
@@ -228,10 +234,10 @@
                             <span>系数</span>
                             <el-input :value="coefficient" placeholder="系数" disabled></el-input>
                         </el-form-item>
-                        <el-form-item>
+                        <!-- <el-form-item>
                             <span>单价</span>
                             <el-input :value="coefficient" placeholder="单价" disabled></el-input>
-                        </el-form-item>
+                        </el-form-item> -->
                         <el-form-item>
                             <span>优先级-仅灯箱画面填报</span>
                             <el-input v-model="infolist.priority" placeholder="优先级-仅灯箱画面填报"
@@ -245,10 +251,10 @@
                                     :disabled="quantityDisabled"
                                 ></el-input>
                             </el-form-item> -->
-                        <el-form-item>
+                        <!-- <el-form-item>
                             <span>物料单价(不含税)</span>
                             <el-input v-model="infolist.price" disabled></el-input>
-                        </el-form-item>
+                        </el-form-item> -->
                         <!-- <el-form-item prop="settlementAmount">
                                 <span>结算金额</span>
                                 <el-input
@@ -726,6 +732,8 @@ export default {
             // return this.infolist.settlementAmount
         },
         accountcho(v) {
+            this.infolist.metirialName = ''
+            
             //   this.account = v;
             //   let x = v;
             //   if (v == "营业厅-VI改造" || v == "营业厅-常规物料") {
@@ -873,8 +881,11 @@ export default {
                     parentCompId: this.infolist.regionCode
                 }
             }).then(res => {
+                console.log(v);
+                console.log('[ 这是什么 ] >', res)
                 if (v !== 3) {
                     this.countyOpt = res.data;
+                    console.log(this.countyOpt);
                 }
 
             });
@@ -1021,6 +1032,7 @@ export default {
                                 parentCompId: this.regionOpt[i].compId
                             }
                         }).then(res => {
+                            console.log('[ res ] >', res)
                             if (this.userInfo.cityName != null && this.userInfo.countyName == null) {
                                 this.countyOpt = res.data;
                             } else if (this.userInfo.cityName != null && this.userInfo.countyName != null) {
@@ -1056,6 +1068,7 @@ export default {
                     parentCompId: "0"
                 }
             }).then(res => {
+                console.log('[ 0 ] >', res)
                 // this.regionOpt = res.data;
 
                 if (

src/pages/main/advertising/contractCap.vue

@@ -27,7 +27,7 @@
                     </el-table-column>
                     <el-table-column prop="secbuySchedule" label="使用进度">
                     </el-table-column>
-                    <el-table-column :label="item.supplierName" v-for="(item, index) in supplierArr" :key="index">
+                    <!-- <el-table-column :label="item.supplierName" v-for="(item, index) in supplierArr" :key="index">
                         <template slot-scope="scope">
                             <div v-if="
                                 scope.row.cMkSupplierCumulativeAmounts.filter(
@@ -42,7 +42,7 @@
                                 {{ item.sumBudget }}
                             </div>
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <!-- <el-table-column prop="advYearn" :label="advYearnLabel">
             					</el-table-column> -->
                     <el-table-column label="操作" width="160px" align="center" v-if="advLeader">
@@ -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
             },
         },
     }

src/pages/main/advertising/materialAppNum.vue

@@ -11,8 +11,14 @@
                 <el-table height="calc(100% - 40px)" class="com-table" ref="multipleTable" :data="tableData"
                     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="region" label="城市">
+                    </el-table-column>
+                    <el-table-column prop="district" label="区县">
+                    </el-table-column>
                     <el-table-column prop="needName" label="业务名称">
                     </el-table-column>
                     <el-table-column prop="state" label="需求编号">

src/pages/main/advertising/supplier.vue

@@ -31,8 +31,8 @@
 					</el-table-column>
 					<!-- <el-table-column prop="buyTypeName" label="采购类型">
 					</el-table-column> -->
-					<el-table-column prop="contractEndTime" label="截止时间">
-					</el-table-column>
+					<!-- <el-table-column prop="contractEndTime" label="截止时间">
+					</el-table-column> -->
                     <el-table-column label="操作" width="160px" align="center">
                         <template slot-scope="scope">
                             <el-button size="mini" type="primary" @click="dialogCheck(1,scope.row)">查看</el-button>
@@ -59,7 +59,7 @@
                         </el-form-item>
 						<el-form-item>
                             <span>供应商编码</span>
-                            <el-input v-model="infolist.code" placeholder="供应商编码" disabled></el-input>
+                            <el-input v-model="infolist.code" placeholder="供应商编码" ></el-input>
                         </el-form-item>
 						<el-form-item prop="cost">
 						    <span>框架总额</span>
@@ -81,7 +81,7 @@
 						    <span>合同编号</span>
 						    <el-input v-model="infolist.frameContractNo" placeholder="合同编号" :disabled="disableStatus"></el-input>
 						</el-form-item>
-						<el-form-item prop="contractSignTime">
+						<!-- <el-form-item prop="contractSignTime">
 						    <span>签订时间</span>
 						    <el-date-picker v-model="infolist.contractSignTime" type="datetime" placeholder="签订时间" :disabled="disableStatus">
 						    </el-date-picker>
@@ -90,13 +90,13 @@
 						    <span>截止时间</span>
 						    <el-date-picker v-model="infolist.contractEndTime" type="datetime" placeholder="截止时间" :disabled="disableStatus">
 						    </el-date-picker>
-						</el-form-item>
-                        <el-form-item prop="contractEndTime">
+						</el-form-item> -->
+                        <el-form-item >
 						    <span>预占总额</span>
 						    <el-input v-model="infolist.preCost"  placeholder="预占总额" :disabled="disableStatus">
 						    </el-input>
 						</el-form-item>
-                        <el-form-item prop="contractEndTime">
+                        <el-form-item >
 						    <span>下单总额</span>
 						    <el-input v-model="infolist.billCost"  placeholder="下单总额" :disabled="disableStatus">
 						    </el-input>