apply-clients 3.0.10-174 → 3.0.10-178

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.0.10-174",
+  "version": "3.0.10-178",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/product/Process/ExplorationSelect.vue

@@ -65,6 +65,14 @@
                   </v-select>
                 </div>
               </div>
+              <div class="form-group col-sm-2">
+                <label class="col-sm-6">营业所:</label>
+                <div class="col-sm-6">
+                  <v-select :width ="'100%'" style="width: 100%" :options="$parent.$parent.business_office" placeholder='营业所' condition="f_business_office  like '%{}%'"
+                            v-model="model.f_business_office" :value.sync="model.f_business_office" close-on-select>
+                  </v-select>
+                </div>
+              </div>
               <div class="col-sm-offset-8">
                 <button class="btn btn-primary btn-sm col-sm-1" type="button" @click="$parent.$parent.searchNow(),$parent.$parent.close()">
                   <span class="glyphicon glyphicon-search"></span>查询
@@ -241,6 +249,7 @@
         // applytype: [{label:"全部",value:''},...this.$appdata.getParam('报建类型')],
         applytype: [{label:"全部",value:''},{label:"新用户",value:'新用户'},{label:"零星散户",value:'零星散户'},{label:"工商业",value:'工商业'}],
         projecttype: this.$appdata.getParam('项目类型'),
+        business_office: this.$appdata.getParam('营业所'),
         // applytype: [{label:"全部",value:''},{label:"零星散户",value:'零星散户'},{label:"工商业",value:'工商业'}],
         timer: null,
         timer1:null,

package/src/components/product/Process/Processes/Service/ServiceControl.vue

@@ -1130,6 +1130,18 @@
             if (this.show_data.fields[i].label === '所属公司') {
               this.show_data.fields[i].value = this.$login.f.orgs
             }
+            //placeholder  required
+            if (this.selectdata.f_apply_type == '新用户') {
+              if (this.show_data.fields[i].label === '项目名称' ||
+                this.show_data.fields[i].label === '营业所' ||
+                this.show_data.fields[i].label === '项目编号' ||
+                this.show_data.fields[i].label === '用气性质' ||
+                this.show_data.fields[i].label === '项目类型' ||
+                this.show_data.fields[i].label === '花名册') {
+                this.show_data.fields[i].required = true
+              }
+            }
+
           }
 
           //如果报建类型是新用户到了核对时的逻辑