广告复测

src/pages/main/advertising/businessHall.vue

@@ -5,13 +5,19 @@
             <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 class="btn-check" size="medium" type="primary" @click="dialogCheck(3)" >添加
                 </el-button>
             </div>
             <div class="search">
@@ -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

src/pages/main/advertising/materialAppNum.vue

@@ -11,6 +11,11 @@
                 <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 prop="region" label="城市">
+                    </el-table-column>
+                    <el-table-column prop="district" label="区县">
+                    </el-table-column>
+
                     <el-table-column type="selection" width="55">
                     </el-table-column>
                     <el-table-column prop="needName" 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>
@@ -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>