ソースを参照

Merge branch 'private-yang' into 'master'

生产环境广告物料替换

See merge request spfm/spfm-market-front!131
徐兴安 3 年 前
コミット
5955ecc7e4

+ 115 - 64
src/pages/main/advertising/businessHall.vue

@@ -48,7 +48,7 @@
                     style="width: 100%"
                     v-loading="loading"
                 >
-                    <el-table-column prop="regionName" label="地市公司">
+                    <el-table-column prop="regionName" label="公司">
                     </el-table-column>
                     <el-table-column prop="regionCode" label="公司编码">
                     </el-table-column>
@@ -56,16 +56,25 @@
                     </el-table-column>
                     <el-table-column prop="countyCode" label="区县编码">
                     </el-table-column>
-                    <el-table-column prop="channelCode" label="渠道编码">
+                    <el-table-column prop="countyTime" label="日期">
                     </el-table-column>
-                    <el-table-column prop="channelName" label="渠道名称">
+                    <el-table-column prop="countyType" label="表单类型">
                     </el-table-column>
-                    <el-table-column prop="sts" label="营业状态">
+<!--                    <el-table-column prop="countyCityCode" label="渠道/小区编码">-->
+<!--&lt;!&ndash;                        待更改&ndash;&gt;-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column prop="countyCityCodeName" label="渠道/小区/校园名称">-->
+<!--                    </el-table-column>-->
+                    <el-table-column prop="channelCode" label="渠道/小区编码">
+                    </el-table-column>
+                    <el-table-column prop="channelName" label="渠道/小区/校园名称">
                     </el-table-column>
-                    <el-table-column prop="sceneName" label="场景">
+                    <el-table-column prop="sts" label="营业状态">
                     </el-table-column>
-                    <el-table-column prop="metirialType" label="物料类别">
+                    <el-table-column prop="sceneName" label="使用场景">
                     </el-table-column>
+<!--                    <el-table-column prop="metirialType" label="物料类别">-->
+<!--                    </el-table-column>-->
                     <el-table-column
                         prop="metirialCode"
                         label="物料编码"
@@ -89,16 +98,16 @@
                         show-overflow-tooltip
                     >
                     </el-table-column>
-                    <el-table-column prop="length" label="长">
+                    <el-table-column prop="length" label="长(米)">
                     </el-table-column>
-                    <el-table-column prop="width" label="宽"> </el-table-column>
+                    <el-table-column prop="width" label="宽(米)"> </el-table-column>
                     <el-table-column prop="direction" label="横/竖">
                     </el-table-column>
                     <el-table-column prop="coefficient" label="系数">
                     </el-table-column>
                     <el-table-column
                         prop="priority"
-                        label="优先级(仅灯箱需要填写)"
+                        label="优先级-仅灯箱画面填报"
                     >
                     </el-table-column>
                     <el-table-column prop="quantity" label="数量">
@@ -158,7 +167,7 @@
         <el-dialog
             :title="titname"
             :visible.sync="dialogStatus"
-            width="50%"
+            width="100%"
             :destroy-on-close="true"
             :modal-append-to-body="false"
             :close-on-click-modal="false"
@@ -173,11 +182,11 @@
                 >
                     <div class="info-line">
                         <el-form-item prop="regionName">
-                            <span>地市公司</span>
+                            <span>公司</span>
                             <el-select
                                 :popper-append-to-body="false"
                                 v-model="infolist.regionCode"
-                                placeholder="地市公司"
+                                placeholder="公司"
                                 @change="verifcheck"
                                 :disabled="disableStatus"
                             >
@@ -224,8 +233,23 @@
                                 disabled
                             ></el-input>
                         </el-form-item>
+                        <el-form-item>
+                            <span>日期</span>
+                            <el-date-picker
+                                type="date"
+                                placeholder="选择日期"
+                                v-model="infolist.countyTime"
+                                style="width: 57%;"
+                            ></el-date-picker>
+                        </el-form-item>
+                        <el-form-item>
+                            <span>表单类型</span>
+                            <el-select v-model="infolist.countyType" placeholder="请选择表单类型">
+                                <el-option v-for="(item,index) in optionList" :label="item.value" :value="item.id" :key="index"></el-option>
+                            </el-select>
+                        </el-form-item>
                         <el-form-item prop="channelCode">
-                            <span>渠道编码</span>
+                            <span>渠道/小区编码</span>
                             <el-input
                                 v-model="infolist.channelCode"
                                 placeholder="渠道编码"
@@ -234,10 +258,10 @@
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="channelName">
-                            <span>渠道名称</span>
+                            <span>渠道/小区/校园名称</span>
                             <el-input
                                 v-model="infolist.channelName"
-                                placeholder="营业厅名称、校园名称、小区名称"
+                                placeholder="渠道/校园/小区名称"
                                 :disabled="disableStatus"
                             >
                             </el-input>
@@ -261,12 +285,12 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item prop="sceneName">
-                            <span>场景</span>
+                            <span>使用场景</span>
                             <el-select
                                 @change="accountcho"
                                 :popper-append-to-body="false"
                                 v-model="infolist.sceneName"
-                                placeholder="场景"
+                                placeholder="使用场景"
                                 :disabled="disableStatus"
                             >
                                 <el-option
@@ -278,23 +302,23 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item prop="metirialType">
-                            <span>物料类别</span>
-                            <el-select
-                                :disabled="disableStatus"
-                                :popper-append-to-body="false"
-                                v-model="infolist.metirialType"
-                                placeholder="物料类别"
-                            >
-                                <el-option
-                                    v-for="(item, index) in metirialTypeopt"
-                                    :key="index"
-                                    :label="item.dataName"
-                                    :value="item.dataName"
-                                >
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
+<!--                        <el-form-item prop="metirialType">-->
+<!--                            <span>物料类别</span>-->
+<!--                            <el-select-->
+<!--                                :disabled="disableStatus"-->
+<!--                                :popper-append-to-body="false"-->
+<!--                                v-model="infolist.metirialType"-->
+<!--                                placeholder="物料类别"-->
+<!--                            >-->
+<!--                                <el-option-->
+<!--                                    v-for="(item, index) in metirialTypeopt"-->
+<!--                                    :key="index"-->
+<!--                                    :label="item.dataName"-->
+<!--                                    :value="item.dataName"-->
+<!--                                >-->
+<!--                                </el-option>-->
+<!--                            </el-select>-->
+<!--                        </el-form-item>-->
                         <el-form-item>
                             <span>物料编码</span>
                             <el-input
@@ -331,7 +355,7 @@
                             <span>规格尺寸</span>
                             <el-input
                                 v-model="infolist.size"
-                                disabled
+
                             ></el-input>
                         </el-form-item>
                         <el-form-item
@@ -341,7 +365,7 @@
                                     infolist.unit == '延长米'
                             "
                         >
-                            <span>长</span>
+                            <span>长(米)</span>
                             <el-input
                                 type="number"
                                 v-model="infolist.length"
@@ -354,7 +378,7 @@
                             prop="width"
                             v-if="infolist.unit == '平方米'"
                         >
-                            <span>宽</span>
+                            <span>宽(米)</span>
                             <el-input
                                 type="number"
                                 v-model="infolist.width"
@@ -364,21 +388,14 @@
                             </el-input>
                         </el-form-item>
                         <el-form-item prop="direction">
-                            <span>横竖</span>
-                            <el-select
+                            <span>横/竖</span>
+                            <el-input
                                 :disabled="disableStatus"
                                 :popper-append-to-body="false"
                                 v-model="infolist.direction"
-                                placeholder="横竖"
+                                placeholder="横/竖"
                             >
-                                <el-option
-                                    v-for="(item, index) in directionopt"
-                                    :key="index"
-                                    :label="item.directionName"
-                                    :value="item.directionName"
-                                >
-                                </el-option>
-                            </el-select>
+                            </el-input>
                         </el-form-item>
                         <el-form-item>
                             <span>系数</span>
@@ -388,13 +405,21 @@
                                 disabled
                             ></el-input>
                         </el-form-item>
+                        <el-form-item>
+                            <span>单价</span>
+                            <el-input
+                                :value="coefficient"
+                                placeholder="单价"
+                                disabled
+                            ></el-input>
+                        </el-form-item>
                         <el-form-item
-                            v-if="infolist.metirialType == '卡布灯箱'"
+
                         >
-                            <span>卡布灯箱优先级</span>
+                            <span>优先级-仅灯箱画面填报</span>
                             <el-input
                                 v-model="infolist.priority"
-                                placeholder="卡布灯箱优先级"
+                                placeholder="优先级-仅灯箱画面填报"
                                 @keyup.native="numberVertify"
                             ></el-input>
                         </el-form-item>
@@ -407,7 +432,7 @@
                             ></el-input>
                         </el-form-item>
                         <el-form-item>
-                            <span>单价</span>
+                            <span>物料单价(不含税)</span>
                             <el-input
                                 v-model="infolist.price"
                                 disabled
@@ -570,6 +595,22 @@ export default {
         // };
 
         return {
+            optionList:[{
+                id:'自有渠道',
+                value:'自有渠道'
+            },{
+                id:'合作渠道',
+                value:'合作渠道'
+            },{
+                id:'家庭市场',
+                value:'家庭市场'
+            },{
+                id:'个人市场',
+                value:'个人市场'
+            },{
+                id:'政企市场',
+                value:'政企市场'
+            }],
             rules: {
                 regionName: [
                     {
@@ -689,12 +730,12 @@ export default {
                     value: "",
                     width: "16%"
                 },
-                {
-                    type: "input",
-                    tit: "物料类别",
-                    value: "",
-                    width: "16%"
-                },
+                // {
+                //     type: "input",
+                //     tit: "物料类别",
+                //     value: "",
+                //     width: "16%"
+                // },
                 {
                     type: "input",
                     tit: "物料名称",
@@ -772,10 +813,10 @@ export default {
                     dataName: "关闭",
                     dataCode: "2"
                 },
-                {
-                    dataName: "暂停营业",
-                    dataCode: "3"
-                }
+                // {
+                //     dataName: "暂停营业",
+                //     dataCode: "3"
+                // }
             ],
             ststOpt: [
                 {
@@ -789,14 +830,22 @@ export default {
             ],
             sceneOpt: [
                 {
-                    dataName: "营业厅-VI改造",
+                    dataName: "营业厅-VI改造-自有渠道",
                     dataCode: "1"
                 },
                 {
-                    dataName: "营业厅-常规物料",
+                    dataName: "营业厅-常规物料-自有渠道",
                     dataCode: "2"
                 },
                 {
+                    dataName: "营业厅-VI改造-合作渠道",
+                    dataCode: "6"
+                },
+                {
+                    dataName: "营业厅-常规物料-合作渠道",
+                    dataCode: "7"
+                },
+                {
                     dataName: "小区",
                     dataCode: "3"
                 },
@@ -1008,6 +1057,7 @@ export default {
             } else if (v === 3) {
                 this.titname = "添加";
                 this.disableStatus = false;
+                this.infolist.countyTime = this.$formatDate(new Date(),"YYYY-MM-DD")
                 // this.infolist.unit = "延长米";
             }
             // this.infolist.opNo = this.userInfo.loginNo;
@@ -1037,6 +1087,7 @@ export default {
                     new Date(),
                     "YYYY-MM-DD"
                 );
+                this.infolist.countyTime = this.$formatDate(this.infolist.countyTime,"YYYY-MM-DD")
 
                 if (this.titname === "添加") {
                     this.submitInfo("/market/cadvBusiMetirial/add");

+ 9 - 0
src/pages/main/advertising/materialApplicationDetail.vue

@@ -80,6 +80,14 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item prop="stsId">
+                        <span>渠道编码</span>
+                        <el-input
+                            v-model="searchSection.channelCode"
+                            placeholder="渠道编码"
+                        >
+                        </el-input>
+                    </el-form-item>
                     <el-button class="btn-check" size="medium" type="primary" plain icon="el-icon-search" @click="searchCli">搜索
                 </el-button>
                 </div>
@@ -537,6 +545,7 @@ export default {
             this.searchSection.regionCode ? this.params.regionCode = this.searchSection.regionCode : '';
             this.searchSection.countyCode ? this.params.countyCode = this.searchSection.countyCode : '';
             this.searchSection.metirialType ? this.params.metirialType = this.searchSection.metirialType : '';
+            this.searchSection.channelCode ? this.params.channelCode = this.searchSection.channelCode : '';
             this.params.woSts = this.searchSection.stsId;
             this.params.woId = this.$route.query.id;
 

+ 71 - 36
src/pages/main/advertising/materialApplicationadd.vue

@@ -78,6 +78,10 @@
                                     </el-table-column>
                                     <el-table-column prop="id" label="物料ID">
                                     </el-table-column>
+                                    <el-table-column prop="countyTime" label="日期">
+                                    </el-table-column>
+                                    <el-table-column prop="countyType" label="表单类型">
+                                    </el-table-column>
                                     <el-table-column
                                         prop="regionName"
                                         label="地市公司"
@@ -95,7 +99,7 @@
                                     </el-table-column>
                                     <el-table-column
                                         prop="channelName"
-                                        label="渠道名称"
+                                        label="渠道/小区/校园名称"
                                     >
                                     </el-table-column>
                                     <el-table-column
@@ -103,11 +107,11 @@
                                         label="场景"
                                     >
                                     </el-table-column>
-                                    <el-table-column
-                                        prop="metirialType"
-                                        label="物料类别"
-                                    >
-                                    </el-table-column>
+<!--                                    <el-table-column-->
+<!--                                        prop="metirialType"-->
+<!--                                        label="物料类别"-->
+<!--                                    >-->
+<!--                                    </el-table-column>-->
                                     <el-table-column
                                         prop="metirialCode"
                                         label="物料编码"
@@ -255,23 +259,38 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item prop="metirialType">
-                        <span>物料类别</span>
-                        <el-select
-                            @change="changeSearch(2)"
-                            clearable
-                            v-model="infolist.metirialType"
-                            placeholder="物料类别"
-                        >
-                            <el-option
-                                v-for="(items, index) in metirialTypeOpt"
-                                :key="index"
-                                :label="items.metirialType"
-                                :value="items.metirialType"
-                            >
-                            </el-option>
+                    <el-form-item>
+                        <span>日期</span>
+                        <el-date-picker
+                            type="date"
+                            placeholder="选择日期"
+                            v-model="infolist.countyTime"
+                            style="width: 57%;"
+                        ></el-date-picker>
+                    </el-form-item>
+                    <el-form-item>
+                        <span>表单类型</span>
+                        <el-select v-model="infolist.countyType" placeholder="请选择表单类型">
+                            <el-option v-for="(item,index) in optionList" :label="item.value" :value="item.id" :key="index"></el-option>
                         </el-select>
                     </el-form-item>
+<!--                    <el-form-item prop="metirialType">-->
+<!--                        <span>物料类别</span>-->
+<!--                        <el-select-->
+<!--                            @change="changeSearch(2)"-->
+<!--                            clearable-->
+<!--                            v-model="infolist.metirialType"-->
+<!--                            placeholder="物料类别"-->
+<!--                        >-->
+<!--                            <el-option-->
+<!--                                v-for="(items, index) in metirialTypeOpt"-->
+<!--                                :key="index"-->
+<!--                                :label="items.metirialType"-->
+<!--                                :value="items.metirialType"-->
+<!--                            >-->
+<!--                            </el-option>-->
+<!--                        </el-select>-->
+<!--                    </el-form-item>-->
                     <el-form-item prop="metirialName">
                         <span>物料名称</span>
                         <el-select
@@ -297,7 +316,7 @@
                             multiple
                             v-model="infolist.regionCode"
                             placeholder="地市名称"
-                        >   
+                        >
                             <!-- <el-option
                                 label="全选"
                                 value="selAllCity"
@@ -338,12 +357,12 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item prop="channelCode">
-                        <span>渠道名称</span>
+                        <span>渠道/小区/校园名称</span>
                         <el-select
                             clearable
                             multiple
                             v-model="infolist.channelCode"
-                            placeholder="渠道名称"
+                            placeholder="渠道/小区/校园名称"
                         >
                             <el-checkbox v-model="isSelAllChannel" @change='selectAllChannel' class="checkboxStyle">全选</el-checkbox>
                             <el-option
@@ -430,7 +449,7 @@
                     <!-- <el-form-item
                         class="info-line online"
                         v-if="companyFlag == 1"
-                    >   
+                    >
                         <el-radio-group v-model="approvalDirection">
                             <el-radio :label="1">区县市场部主任,区县总经理</el-radio>
                             <el-radio :label="2">需求部门领导</el-radio>
@@ -456,8 +475,8 @@
                             </p>
                         </div>
                     </el-form-item>
-                    
-                    
+
+
                 </el-form>
 
                 <div
@@ -563,6 +582,22 @@ export default {
         // };
 
         return {
+            optionList:[{
+                id:1,
+                value:'自有渠道'
+            },{
+                id:2,
+                value:'合作渠道'
+            },{
+                id:3,
+                value:'家庭市场'
+            },{
+                id:4,
+                value:'个人市场'
+            },{
+                id:5,
+                value:'政企市场'
+            }],
             rules: {
                 terminalTypeName: [
                     {
@@ -819,7 +854,7 @@ export default {
                             }).then(res => {
                                 countyOpt2 = countyOpt2.concat(res.data);
                                 this.countyOpt = countyOpt2;
-                                
+
                             });
                         }
                     }
@@ -866,7 +901,7 @@ export default {
                     this.isSelAllCounty = true
                 }else{
                     this.isSelAllCounty = false
-                    
+
                 }
                 this.$http({
                     url: "/market/cadvBusiMetirial/queryChannel",
@@ -881,7 +916,7 @@ export default {
             } else {
 
                 this.infolist.countyCode = [];
-                
+
                 if(ev.length === this.regionOpt.length){
                     this.isSelAllCity = true
                 }else{
@@ -908,13 +943,13 @@ export default {
                             }).then(res => {
                                 countyOpt2 = countyOpt2.concat(res.data);
                                 this.countyOpt = countyOpt2;
-                                
+
                             });
                         }
                     }
                 }
-                
-                
+
+
             }
         },
         //获取物料类型
@@ -1133,7 +1168,7 @@ export default {
                         },
                         data: v
                     }).then(res => {
-                        
+
                         if (res.data.result === 2) {
                             _this.$message({
                                 message: res.data.desc,
@@ -1213,7 +1248,7 @@ export default {
                     // message: '取消按钮点击'
                     // })
                 });
-                
+
         },
         // closeMessage(v) {
         //     this.centerDialogVisible = false;
@@ -1347,7 +1382,7 @@ export default {
         // info.channelCodePks = "232344,23323,wgeg,qw";
         // info.regionCodePks = "304422,304423";
         // info.countyCodePks = "00440022002100000000,00440023002100000000";
-        
+
         // this.$http({
         //     url: "/market/advBusiMetirial/queryList",
         //     method: "post",

+ 227 - 104
src/pages/main/advertising/materiel.vue

@@ -7,13 +7,17 @@
                     :searchList="searchList"
                     @searchInfo="searchInfo"
                 ></mySearch>
+                <el-button class="btn-check" size="medium" type="primary" @click="exportTempletelist">下载导入模板
+                </el-button>
                 <el-button
                     class="btn-check"
                     size="medium"
                     type="primary"
-                    @click="dialogCheck(3)" v-if="userInfo.loginNo=='jiangshuai'"
+                    @click="dialogCheck(3)" v-if="userInfo.loginNo=='rensiying'"
                     >添加
                 </el-button>
+                <myUpload style="display:inline-block;" :fileInfo="fileInfot"
+                          :fileList="fileInfot.fileList" @uploadBack='uploadBack'></myUpload>
             </div>
             <div class="tabbox">
                 <el-table
@@ -27,17 +31,17 @@
                     style="width: 100%"
                     v-loading="loading"
                 >
-                    <el-table-column prop="sceneName" label="场景">
+                    <el-table-column prop="sceneName" label="使用场景">
                     </el-table-column>
                     <el-table-column prop="proviceFlagName" label="下单模式">
                     </el-table-column>
                     <!-- <el-table-column prop="metirialType" label="细分类型">
 					</el-table-column> -->
 
-                    <el-table-column prop="metirialType" label="类别">
-                    </el-table-column>
-                    <el-table-column prop="isAsic" label="基础数据">
-                    </el-table-column>
+<!--                    <el-table-column prop="metirialType" label="类别">-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column prop="isAsic" label="基础数据">-->
+<!--                    </el-table-column>-->
                     <el-table-column
                         prop="metirialCode"
                         label="物料编码"
@@ -46,13 +50,19 @@
                     </el-table-column>
                     <el-table-column prop="metirialName" label="物料名称">
                     </el-table-column>
+<!--                    <el-table-column prop="supplierCode" label="供应商">-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column prop="size" label="规格尺寸">-->
+<!--                    </el-table-column>-->
+<!--                    <el-table-column prop="coefficient" label="勾选后系数">-->
+<!--                    </el-table-column>-->
                     <!--<el-table-column prop="quality" label="材质" width="200" show-overflow-tooltip>
 					</el-table-column> -->
                     <!-- <el-table-column prop="size" label="规格" show-overflow-tooltip>
 					</el-table-column> -->
-                    <el-table-column prop="unit" label="单位">
+                    <el-table-column prop="unit" label="物料单位">
                     </el-table-column>
-                    <el-table-column prop="price" label="不含税单价">
+                    <el-table-column prop="price" label="不含税单价(元)">
                     </el-table-column>
                     <!-- <el-table-column prop="proviceFlagName" label="申请权限">
 					</el-table-column> -->
@@ -68,13 +78,13 @@
                             <el-button
                                 size="mini"
                                 type="primary"
-                                @click="dialogCheck(2, scope.row)" v-if="userInfo.loginNo=='jiangshuai'"
+                                @click="dialogCheck(2, scope.row)" v-if="userInfo.loginNo=='rensiying'"
                                 >修改</el-button
                             >
                             <el-button
                                 size="mini"
                                 type="danger"
-                                @click="delLine(scope.row)" v-if="userInfo.loginNo=='jiangshuai'"
+                                @click="delLine(scope.row)" v-if="userInfo.loginNo=='rensiying'"
                                 >删除</el-button
                             >
                         </template>
@@ -143,40 +153,40 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
-                        <el-form-item prop="metirialType">
-                            <span>物料类别</span>
-                            <el-select
-                                :disabled="disableStatus"
-                                :popper-append-to-body="false"
-                                v-model="infolist.metirialType"
-                                placeholder="物料类别"
-                            >
-                                <el-option
-                                    v-for="(item, index) in metirialTypeopt"
-                                    :key="index"
-                                    :label="item.dataName"
-                                    :value="item.dataName"
-                                >
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item prop="isAsic">
-                            <span>基础数据</span>
-                            <el-select
-                                :disabled="disableStatus"
-                                :popper-append-to-body="false"
-                                v-model="infolist.isAsic"
-                                placeholder="基础数据"
-                            >
-                                <el-option
-                                    v-for="item in isAsicopt"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.name"
-                                >
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
+<!--                        <el-form-item prop="metirialType">-->
+<!--                            <span>物料类别</span>-->
+<!--                            <el-select-->
+<!--                                :disabled="disableStatus"-->
+<!--                                :popper-append-to-body="false"-->
+<!--                                v-model="infolist.metirialType"-->
+<!--                                placeholder="物料类别"-->
+<!--                            >-->
+<!--                                <el-option-->
+<!--                                    v-for="(item, index) in metirialTypeopt"-->
+<!--                                    :key="index"-->
+<!--                                    :label="item.dataName"-->
+<!--                                    :value="item.dataName"-->
+<!--                                >-->
+<!--                                </el-option>-->
+<!--                            </el-select>-->
+<!--                        </el-form-item>-->
+<!--                        <el-form-item prop="isAsic">-->
+<!--                            <span>基础数据</span>-->
+<!--                            <el-select-->
+<!--                                :disabled="disableStatus"-->
+<!--                                :popper-append-to-body="false"-->
+<!--                                v-model="infolist.isAsic"-->
+<!--                                placeholder="基础数据"-->
+<!--                            >-->
+<!--                                <el-option-->
+<!--                                    v-for="item in isAsicopt"-->
+<!--                                    :key="item.id"-->
+<!--                                    :label="item.name"-->
+<!--                                    :value="item.name"-->
+<!--                                >-->
+<!--                                </el-option>-->
+<!--                            </el-select>-->
+<!--                        </el-form-item>-->
 
                         <!-- <el-form-item prop="metirialType">
 							<span>细分类型</span>
@@ -208,57 +218,57 @@
                             >
                             </el-input>
                         </el-form-item>
-                        <el-form-item prop="supplierCode">
-                            <span>供应商</span>
-                            <el-select
-                                :disabled="disableStatus"
-                                :popper-append-to-body="false"
-                                v-model="infolist.supplierCode"
-                                placeholder="供应商"
-                                @change="verifall"
-                            >
-                                <el-option
-                                    v-for="item in suppOpt"
-                                    :key="item.code"
-                                    :label="item.name"
-                                    :value="item.code"
-                                >
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                        <el-form-item prop="size">
-                            <span>规格尺寸</span>
-                            <el-input
-                                v-model="infolist.size"
-                                placeholder="规格尺寸"
-                                :disabled="disableStatus"
-                            ></el-input>
-                        </el-form-item>
-                        <el-form-item prop="coefficient">
-                            <span>勾选后系数</span>
-                            <el-select
-                                :disabled="disableStatus"
-                                :popper-append-to-body="false"
-                                v-model="infolist.coefficient"
-                                placeholder="勾选后系数"
-                            >
-                                <el-option
-                                    v-for="item in coefficientopt"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.id"
-                                >
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
+<!--                        <el-form-item prop="supplierCode">-->
+<!--                            <span>供应商</span>-->
+<!--                            <el-select-->
+<!--                                :disabled="disableStatus"-->
+<!--                                :popper-append-to-body="false"-->
+<!--                                v-model="infolist.supplierCode"-->
+<!--                                placeholder="供应商"-->
+<!--                                @change="verifall"-->
+<!--                            >-->
+<!--                                <el-option-->
+<!--                                    v-for="item in suppOpt"-->
+<!--                                    :key="item.code"-->
+<!--                                    :label="item.name"-->
+<!--                                    :value="item.code"-->
+<!--                                >-->
+<!--                                </el-option>-->
+<!--                            </el-select>-->
+<!--                        </el-form-item>-->
+<!--                        <el-form-item prop="size">-->
+<!--                            <span>规格尺寸</span>-->
+<!--                            <el-input-->
+<!--                                v-model="infolist.size"-->
+<!--                                placeholder="规格尺寸"-->
+<!--                                :disabled="disableStatus"-->
+<!--                            ></el-input>-->
+<!--                        </el-form-item>-->
+<!--                        <el-form-item prop="coefficient">-->
+<!--                            <span>勾选后系数</span>-->
+<!--                            <el-select-->
+<!--                                :disabled="disableStatus"-->
+<!--                                :popper-append-to-body="false"-->
+<!--                                v-model="infolist.coefficient"-->
+<!--                                placeholder="勾选后系数"-->
+<!--                            >-->
+<!--                                <el-option-->
+<!--                                    v-for="item in coefficientopt"-->
+<!--                                    :key="item.id"-->
+<!--                                    :label="item.name"-->
+<!--                                    :value="item.id"-->
+<!--                                >-->
+<!--                                </el-option>-->
+<!--                            </el-select>-->
+<!--                        </el-form-item>-->
                         <el-form-item prop="unit">
-                            <span>单位</span>
+                            <span>物料单位</span>
                             <!-- <el-input v-model="infolist.unit" placeholder="单位" :disabled="disableStatus"></el-input> -->
                             <el-select
                                 :disabled="disableStatus"
                                 :popper-append-to-body="false"
                                 v-model="infolist.unit"
-                                placeholder="单位"
+                                placeholder="物料单位"
                             >
                                 <el-option
                                     v-for="item in unitopt"
@@ -270,11 +280,11 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item prop="price">
-                            <span>不含税单价</span>
+                            <span>不含税单价(元)</span>
                             <el-input
                                 type="number"
                                 v-model="infolist.price"
-                                placeholder="不含税单价"
+                                placeholder="不含税单价(元)"
                                 :disabled="disableStatus"
                             ></el-input>
                         </el-form-item>
@@ -321,12 +331,14 @@
 import mySearch from "../../../components/search.vue";
 import myMessage from "../../../components/myMessage.vue";
 import toolList from "../../../components/toolList";
+import myUpload from "../../../components/upload.vue";
 
 export default {
     components: {
         mySearch,
         myMessage,
-        toolList
+        toolList,
+        myUpload
     },
     data() {
         const sceneName = (rule, value, callback) => {
@@ -529,12 +541,20 @@ export default {
                     width: "31%",
                     options: [
                         {
-                            dataCode: "营业厅- VI改造",
-                            dataName: "营业厅- VI改造"
+                            dataCode: "营业厅-VI改造-自有渠道",
+                            dataName: "营业厅-VI改造-自有渠道"
+                        },
+                        {
+                            dataCode: "营业厅-常规物料-自有渠道",
+                            dataName: "营业厅-常规物料-自有渠道"
+                        },
+                        {
+                            dataCode: "营业厅-VI改造-合作渠道",
+                            dataName: "营业厅-VI改造-合作渠道"
                         },
                         {
-                            dataCode: "营业厅-基础物料",
-                            dataName: "营业厅-基础物料"
+                            dataCode: "营业厅-常规物料-合作渠道",
+                            dataName: "营业厅-常规物料-合作渠道"
                         },
                         {
                             dataCode: "小区",
@@ -561,18 +581,32 @@ export default {
                             dataName: "省公司"
                         },
                         {
-                            dataCode: "地市公司",
-                            dataName: "地市公司"
+                            dataCode: "地市",
+                            dataName: "地市"
                         },
 
                         {
                             dataCode: "省+地市",
                             dataName: "省+地市"
+                        },
+                        {
+                            dataCode: "省+市",
+                            dataName: "省+市"
                         }
                     ]
                 },
-                { type: "input", tit: "物料名称", value: "", width: "31%" }
+                { type: "input", tit: "物料名称", value: "", width: "31%" },
+                { type: "input", tit: "物料编码", value: "", width: "31%" }
             ],
+            fileInfot: {
+                type: 'btn',
+                typename: '导入',
+                btntype: 'primary',
+                limit: 1,
+                url: '/market/cadvSecbuyMetirial/import',
+                fileList: [],
+                woNo: "",
+            },
             tooltit: "二采物料类型建档",
             fullscreen: false,
             total: 0,
@@ -597,11 +631,14 @@ export default {
                 },
                 {
                     id: "1",
-                    name: "地市公司"
+                    name: "地市"
                 },
                 {
                     id: "2",
                     name: "省+地市"
+                },{
+                    id: "",
+                    name: "省+市"
                 }
             ],
             //使用场景
@@ -616,14 +653,22 @@ export default {
                 },
                 {
                     dataCode: "3",
-                    dataName: "营业厅- VI改造"
+                    dataName: "营业厅-VI改造-自有渠道"
                 },
                 {
                     dataCode: "4",
-                    dataName: "营业厅-基础物料"
+                    dataName: "营业厅-常规物料-自有渠道"
                 },
                 {
                     dataCode: "5",
+                    dataName:'营业厅-VI改造-合作渠道'
+                },
+                {
+                    dataCode: "6",
+                  dataName: '营业厅-常规物料-合作渠道'
+                },
+                {
+                    dataCode: "7",
                     dataName: "政企"
                 }
             ],
@@ -669,6 +714,12 @@ export default {
                 {
                     id: "4",
                     name: "组"
+                },{
+                    id: "5",
+                    name: "延米"
+                },{
+                    id:'6',
+                    name:'张'
                 }
             ],
             //物料名称
@@ -690,6 +741,40 @@ export default {
             //     }
             // }
         },
+        exportTempletelist() {
+            let data = this.params;
+            console.log(data);
+            // return
+            this.$http({
+                url: "/market/cadvSecbuyMetirial/excelExportTemplete",
+                method: "post",
+                headers: {
+                    "Content-Type": "application/json",
+                },
+                responseType: "blob",
+                data: data,
+            }).then((response) => {
+                if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+                    let blob = new Blob([response.data], {
+                        type: 'application/vnd.ms-excel'
+                    })
+                    window.navigator.msSaveOrOpenBlob(blob,
+                        new Date().getTime() + '.xlsx')
+                } else {
+                    /* 火狐谷歌的文件下载方式 */
+                    var blob = new Blob([response.data])
+                    var downloadElement = document.createElement('a')
+                    var href = window.URL.createObjectURL(blob)
+                    downloadElement.href = href
+                    downloadElement.download = new Date().getTime() + '.xlsx'
+                    document.body.appendChild(downloadElement)
+                    downloadElement.click()
+                    document.body.removeChild(downloadElement)
+                    window.URL.revokeObjectURL(href)
+                }
+            });
+        },
+
         usePlance(v) {
             this.usePlanceArr = v;
 
@@ -724,8 +809,47 @@ export default {
             v[0] ? (this.params.sceneName = v[0]) : "";
             v[1] ? (this.params.proviceFlagName = v[1]) : "";
             v[2] ? (this.params.metirialName = v[2]) : "";
+            v[3] ?(this.params.metirialCode = v[3]) :"";
             this.getList(this.params, this.pageSize);
         },
+        uploadBack(v) {
+            let that = this;
+            console.log(v);
+            if(v.data.result==0){
+                that.getList({}, 1);
+                that.getUser();
+                that.getMetirialType();
+                that.getMetirialInfo();
+            }
+        },
+        getMetirialInfo() {
+            this.$http({
+                url: "/market/cadvSecbuyMetirial/queryList",
+                method: "post",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                data: {
+                    dictCodePks: "metirialType"
+                }
+            }).then(res => {
+                this.materialNameopt = res.data;
+            });
+        },
+        getMetirialType() {
+            this.$http({
+                url: "/sysmgr/cfgDataDicts/queryMap",
+                method: "post",
+                headers: {
+                    "Content-Type": "application/json"
+                },
+                data: {
+                    dictCodePks: "metirialType"
+                }
+            }).then(res => {
+                this.metirialTypeopt = res.data.body.metirialType;
+            });
+        },
         //获取列表
         getList(v, n) {
             this.pageSize = n;
@@ -907,8 +1031,7 @@ export default {
             this.delid = v.id;
         },
         //文件返回值
-        uploadBack(v) {
-        },
+
         //功能栏
         iconCli(v) {
             if (v === 1) {

+ 3 - 3
src/pages/main/advertising/supplier.vue

@@ -4,7 +4,7 @@
             <toolList @iconCli='iconCli' :tooltit='tooltit'></toolList>
             <div class="search">
                 <!-- <mySearch :searchList="searchList" @searchInfo="searchInfo"></mySearch> -->
-                <el-button class="btn-check" size="medium" type="primary" @click="dialogCheck(3)" v-if="userInfo.loginNo=='jiangshuai'">添加
+                <el-button class="btn-check" size="medium" type="primary" @click="dialogCheck(3)" v-if="userInfo.loginNo=='rensiying'">添加
                 </el-button>
             </div>
             <div class="tabbox">
@@ -32,8 +32,8 @@
                     <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>
-                            <el-button size="mini" type="primary" @click="dialogCheck(2,scope.row)" v-if="userInfo.loginNo=='jiangshuai'">修改</el-button>
-                            <el-button size="mini" type="danger" @click="delLine(scope.row)" v-if="userInfo.loginNo=='jiangshuai'">删除</el-button>
+                            <el-button size="mini" type="primary" @click="dialogCheck(2,scope.row)" v-if="userInfo.loginNo=='rensiying'">修改</el-button>
+                            <el-button size="mini" type="danger" @click="delLine(scope.row)" v-if="userInfo.loginNo=='rensiying'">删除</el-button>
                         </template>
                     </el-table-column>
                 </el-table>