Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/contractManage/index.vue

@@ -31,8 +31,8 @@
             <el-option
               v-for="item in areaList"
               :key="item.index"
-              :label="item.title"
-              :value="item.name"
+              :label="item.templetname"
+              :value="item.templetid"
             ></el-option>
           </el-select>
         </div>
@@ -139,26 +139,6 @@ export default {
       options:[],
       dateSelect:'',
       areaList:[
-        {
-          title: '我负责的',
-          name: "1",
-        },
-        {
-          title: '我参与的',
-          name: "2",
-        },
-        {
-          title: '我创建的',
-          name: "5",
-        },
-        {
-          title: '我下属负责的',
-          name: "3",
-        },
-        {
-          title: '我下属参与的',
-          name: "4",
-        }
       ],
       typeList:[],
       area:'1',
@@ -178,6 +158,7 @@ export default {
     this.getSystemList()
     this.getAgentList()
     this.queryUserInfo()
+    this.querytemplet()
   },
   methods:{
     async getSystemList () {
@@ -247,6 +228,15 @@ export default {
       this.$refs.list.param.content.where = this.selectParam
       this.$refs.list.listData()
     },
+    async querytemplet () {
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.querytemplet.querytemplet",
+        "method":"query",
+        "content": {}
+      })
+      this.areaList = res.data
+      this.area = res.data[0].templetid
+    }
   }
 }
 

src/HDrpManagement/invoiceapp/modules/add.vue

@@ -97,7 +97,8 @@ export default {
         sa_invoiceapplyid:0,
         remarks:'',
         byhand:false,
-        invoiceline:'p'
+        invoiceline:'p',
+        quota:"10000000",
       },
       accountAmount:'',
       value:'',

src/HDrpManagement/projectChange/index.vue

@@ -25,11 +25,11 @@
           <label  class="search__label" >范围:</label>
           <el-select class="inline-24" v-model="tabName" placeholder="请选择数据分类" @change="selectChange" size="small" >
             <el-option
-                v-for="item in editableTabs"
-                :key="item.name"
-                :label="item.title"
-                :value="item.name">
-            </el-option>
+            v-for="item in editableTabs"
+            :key="item.index"
+            :label="item.templetname"
+            :value="item.templetid"
+          ></el-option>
           </el-select>
         </div>
         <div class="mt-10">
@@ -195,27 +195,7 @@ export default {
       tradefieldSelect:[],
       tabName:"1",
       tabIndex:"1",
-      editableTabs: [
-        {
-          title: '我负责的',
-          name: "1",
-        },
-        {
-          title: '我参与的',
-          name: "2",
-        },
-        {
-          title: '我创建的',
-          name: "5",
-        },
-        {
-          title: '我下属负责的',
-          name: "3",
-        },
-        {
-          title: '我下属参与的',
-          name: "4",
-        }],
+      editableTabs: [],
       selectParam: {
         status:'',
         projecttype:'',
@@ -372,7 +352,7 @@ export default {
       this.$store.dispatch('optiontypeselect','tradefield').then(res=>{
         this.tradefieldSelect = res.data
       })
-    }
+    },
     /*onChangeTab(val){
       console.log(val)
       this.tabIndex = val
@@ -388,11 +368,21 @@ export default {
       this.$refs['basicLayout'].param.content.where.enddate = time[1]
       this.$refs['basicLayout'].listData()
     }*/
+    async querytemplet () {
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.querytemplet.querytemplet",
+        "method":"query",
+        "content": {}
+      })
+      this.editableTabs = res.data
+      this.tabName = res.data[0].templetid
+    }
   },
   mounted () {
     this.queryData(1)
     this.queryBrand()
     this.queryTradefield()
+    this.querytemplet()
   }
 }
 </script>

src/HManagement/clueManage/m_activity/index.vue

@@ -147,8 +147,6 @@ export default {
       this.areaList2 = res.data
       this.area = res.data[0].templetid
     }
-   
-
   },
   created () {
     this.campaigntype()

src/SDrpManagement/QuotedPrice/index.vue

@@ -19,11 +19,11 @@
           <label  class="search__label" >范围:</label>
           <el-select class="inline-24" v-model="tabName" placeholder="请选择数据分类" @change="selectChange" size="small" clearable>
             <el-option
-                v-for="item in editableTabs"
-                :key="item.name"
-                :label="item.title"
-                :value="item.name">
-            </el-option>
+              v-for="item in editableTabs"
+              :key="item.index"
+              :label="item.templetname"
+              :value="item.templetid"
+            ></el-option>
           </el-select>
         </div>
         <div class="mt-10">
@@ -130,27 +130,7 @@ export default {
       tabName:"1",
       tabIndex:"1",
       dateSelect:'',
-      editableTabs: [
-        {
-          title: '我负责的',
-          name: "1",
-        },
-        {
-          title: '我参与的',
-          name: "2",
-        },
-        {
-          title: '我创建的',
-          name: "5",
-        },
-        {
-          title: '我下属负责的',
-          name: "3",
-        },
-        {
-          title: '我下属参与的',
-          name: "4",
-        }],
+      editableTabs: [],
       statusList:[
         {
           value:'新建'
@@ -229,12 +209,22 @@ export default {
       console.log(data);
 
     },
+    async querytemplet () {
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.querytemplet.querytemplet",
+        "method":"query",
+        "content": {}
+      })
+      this.editableTabs = res.data
+      this.tabName = res.data[0].templetid
+    }
   },
   mounted() {
     this.isSaler()
   },
   created() {
     this.queryUserInfo()
+    this.querytemplet()
   }
 }
 </script>

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -14,12 +14,18 @@
         <div class="mt-10">
           <label class="search__label">范围:</label>
           <el-select class="inline-16" v-model="value" size="small" placeholder="请选择数据分类" @change="selectChange" >
-            <el-option
+            <!-- <el-option
               v-for="item in editableTabs"
               :key="item.index"
               :label="item.title"
               :value="item.name">
-            </el-option>
+            </el-option> -->
+            <el-option
+              v-for="item in editableTabs"
+              :key="item.index"
+              :label="item.templetname"
+              :value="item.templetid"
+            ></el-option>
           </el-select>
         </div>
         <div  class="mt-10">
@@ -159,29 +165,9 @@ export default {
   name: "index",
   data() {
     return {
-      value:'1',
+      value:'',
       editableTabsValue: "我负责的",
       editableTabs: [
-        {
-          title: '我负责的',
-          name: "1",
-        },
-        {
-          title: '我参与的',
-          name: "2",
-        },
-        {
-          title: '我创建的',
-          name: "5",
-        },
-        {
-          title: '我下属负责的',
-          name: "3",
-        },
-        {
-          title: '我下属参与的',
-          name: "4",
-        }
       ],
       tabIndex:"1",
       options:[],
@@ -359,9 +345,19 @@ export default {
       console.log(JSON.parse(window.sessionStorage.getItem('userInfo')));
 
     },
+    async querytemplet () {
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.querytemplet.querytemplet",
+        "method":"query",
+        "content": {}
+      })
+      this.editableTabs = res.data
+      this.value = res.data[0].templetid
+    }
   },
   created() {
     this.queryUserInfo()
+    this.querytemplet()
   },
 }
 </script>

src/SManagement/orderclue/index.vue

@@ -26,11 +26,11 @@
           placeholder="请选择范围"
           @change="areaChange"
         >
-          <el-option
+         <el-option
             v-for="item in areaList2"
             :key="item.index"
-            :label="item.title"
-            :value="item.name"
+            :label="item.templetname"
+            :value="item.templetid"
           ></el-option>
         </el-select>
       </div>
@@ -75,28 +75,8 @@ export default {
       arealist:[],
       teamList:[],
       areaList2:[
-        {
-          title: '我负责的',
-          name: "1",
-        },
-        {
-          title: '我参与的',
-          name: "2",
-        },
-        {
-          title: '我创建的',
-          name: "5",
-        },
-        {
-          title: '我下属负责的',
-          name: "3",
-        },
-        {
-          title: '我下属参与的',
-          name: "4",
-        }
       ],
-      area:'1',
+      area:'',
       tabIndex:"1",
       status:'',
       statusList:[]
@@ -112,7 +92,7 @@ export default {
     this.getTeamList()
     this.query_arealist()
     this.queryUserInfo()
-
+    this.querytemplet()
    /* const res = await this.$store.dispatch('optiontypeselect','dataarea')
     this.areaList2 = res.data*/
 
@@ -180,6 +160,15 @@ export default {
       console.log(data,"数据");
   
     },
+    async querytemplet () {
+      const res = await this.$api.requested({
+        "classname": "sysmanage.develop.querytemplet.querytemplet",
+        "method":"query",
+        "content": {}
+      })
+      this.areaList2 = res.data
+      this.area = res.data[0].templetid
+    }
   }
 }