apply-clients 5.0.35-35 → 5.0.35-38

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

@@ -451,7 +451,7 @@
             } else {
               data = {
                 tablename: this.data.onetomany[index].tables[0],
-                condition: `f_apply_num = '${this.selectdata.f_apply_num}'  and f_process_id='${this.selectdata.f_process_id}'`
+                condition: `f_process_id='${this.selectdata.f_process_id}'`
               }
             }
             let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
@@ -1573,19 +1573,19 @@
 
         }
         if (model.button.button_name === '提交') {
-          for (let i = 0; i < this.show_data.fields.length; i++) {
-            if (this.show_data.fields[i].label === '收费项目') {
-              let yuanXiang = this.show_data.fields[i].value
-              if (yuanXiang != '' && yuanXiang != null) {
-                for (let i = 0; i < yuanXiang.length; i++) {
-                  this.xia += yuanXiang[i] + '-'
-                }
-                let idx = this.xia.lastIndexOf("-");
-                this.xiangmu = this.xia.substring(0,idx)
-              }
-             model.f_charge_items = this.xiangmu
-            }
-          }
+          // for (let i = 0; i < this.show_data.fields.length; i++) {
+          //   if (this.show_data.fields[i].label === '收费项目') {
+          //     let yuanXiang = this.show_data.fields[i].value
+          //     if (yuanXiang != '' && yuanXiang != null) {
+          //       for (let i = 0; i < yuanXiang.length; i++) {
+          //         this.xia += yuanXiang[i] + '-'
+          //       }
+          //       let idx = this.xia.lastIndexOf("-");
+          //       this.xiangmu = this.xia.substring(0,idx)
+          //     }
+          //    model.f_charge_items = this.xiangmu
+          //   }
+          // }
           var flag = false
           if (this.data.defname == '合同审核') {
             flag = true

package/src/components/product/ServiceView.vue

@@ -93,7 +93,7 @@
             </div>
 
             <!--select-->
-            <div style="height: 34px" v-if="item.type==='select' && item.label !== '收费项目'" v-show="!item.hidden"
+            <div style="height: 34px" v-if="item.type==='select'" v-show="!item.hidden"
                  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group ':'col-sm-4 form-group']">
               <label style="width:85px;"
                 :class="item.label_bootstraped?item.label_bootstraped+' control-label control-label-justify':'control-label-justify control-label col-sm-6'">{{item.label}}</label>
@@ -106,20 +106,6 @@
 
             </div>
 
-            <!--select-->
-            <div style="height: 34px" v-if="item.type==='select' && item.label === '收费项目'"  v-show="!item.hidden"
-                 :class="[data.fields[index].required &&!(data.fields[index].value) ? 'has-error' : '','col-sm-8 form-group']">
-              <label style="width:85px;"
-                     :class="item.label_bootstraped?item.label_bootstraped+' control-label control-label-justify':'control-label-justify control-label col-sm-6'">{{item.label}}</label>
-              <v-select :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'" @blur="check_disable"
-                            @change="select_change(index),disabled_check(data.fields[index].required,data.fields[index].value)"
-                            :readonly="item.readonly" :disabled="item.disabled" :value.sync="data.fields[index].value"
-                            v-model="data.fields[index].value"
-                            :search="true"
-                            multiple
-                            :options='data.fields[index].options' :valueSingle="true"></v-select>
-
-            </div>
 
             <!--checkbox-->
             <div v-if="item.type==='checkbox'"
@@ -137,7 +123,7 @@
           </div>
           <!-- onetomany -->
           <div class="col-sm-12" v-for="(i,datagrid) in data.onetomany">
-            <table v-show="!datagrid.hidden" class="table table-bordered table-striped table-hover">
+            <table v-show="!datagrid.hidden" class="table table-bordered table-striped table-hover" style="margin-top: 80px">
               <tr style="background-color: #00A3F0">
                 <th style="text-align: center;border-color: #00A3F0"><font color="white">序号</font></th>
                 <th v-for="labels in datagrid.fields" style="text-align: center;border-color: #00A3F0">