apply-clients 3.0.4 → 3.0.5-2

package/src/components/product/ServiceView.vue

@@ -1,23 +1,26 @@
 <template>
   <div class="auto select-overspread" v-if="refresh">
-    <!--<div class="panel panel-info" v-if="!data.titlevisible">-->
-    <!--<div class="panel-heading">-->
-    <!--<h3 class="panel-title">-->
-    <!--<span >{{data.title}}</span>-->
-    <!--<span v-if="data.back_reason" style="color: red;font-family: 微软雅黑;font-weight: bold">    请注意被退回原因为:{{data.back_reason}}</span>-->
-    <!--</h3>-->
-    <!--</div>-->
-    <!--</div>-->
+    <div class="panel panel-info" v-if="!data.titlehidden">
+      <div class="panel-heading">
+        <h3 class="panel-title">
+          <span>{{data.title}}</span>
+        </h3>
+      </div>
+    </div>
     <validator name="v">
       <form class="form-horizontal">
-        <div class="col-sm-11 form-group">
+        <div class="col-sm-12 form-group">
           <div v-for="(index,item) in data.fields">
             <!--input-->
-            <div style="height: 34px" v-if="item.type==='input' || item.type==='number'" v-show="!item.hidden"
+            <div :style="item.style? item.style+';height: 34px;':'height: 34px;'"
+                 v-if="item.type==='input' || item.type==='number'||item.type === 'tel'||item.type === 'email'"
+                 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 :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{item.label}}：</label>
-              <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'">
-                <input class="form-control"
+              <label :style="item.label_style? item.label_style:''"
+                     :class="item.label_bootstraped?item.label_bootstraped+' control-label-justify control-label':item.label_style?'':'control-label-justify control-label col-sm-6'">{{item.label}}</label>
+              <div :style="item.value_style? item.value_style:''"
+                   :class="item.value_bootstraped?item.value_bootstraped:item.value_style?'':'col-sm-6'">
+                <input class="form-control" style="background-color: #f7fbff;"
                        :type="item.type"
                        v-model="data.fields[index].value"
                        :placeholder="item.placeholder"
@@ -27,35 +30,47 @@
                        @change="select_change(index),disabled_check(data.fields[index].required,data.fields[index].value)"
                        @blur="select_change(index),check_disable"
                 />
+                <span
+                  v-if="data.fields[index].error&&data.fields[index].error.msg&&data.fields[index].error.flag"
+                  style="color: red">{{data.fields[index].error.msg}}</span>
               </div>
             </div>
             <!--时间datepicker-->
-            <div style="height: 34px" v-if="item.type==='datepicker'" v-show="!item.hidden"
+            <div :style="item.style? item.style+';height: 34px;':'height: 34px;'" v-if="item.type==='datepicker'"
+                 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 :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{item.label}}：</label>
+              <label
+                :class="item.label_bootstraped?item.label_bootstraped+' control-label-justify control-label':'control-label control-label-justify col-sm-6'">{{item.label}}</label>
               <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'">
                 <datepicker
+                  @change="select_change(index),disabled_check(data.fields[index].required,data.fields[index].value)"
+                  @blur="select_change(index),check_disable"
                   :placeholder="item.placeholder"
                   :value.sync="data.fields[index].value"
-                  :format="'yyyy-MM-dd HH:mm:ss'"
+                  :format="'yyyy-MM-dd'"
                   v-model="data.fields[index].value"
-                  :readonly=true
+                  :readonly="showadd_fields.fields[index].readonly"
                   :disabled="item.disabled"
-                  @blur="check_disable"
                   :show-reset-button="reset">
                 </datepicker>
               </div>
+              <span
+                v-if="showadd_fields.fields[index].error&&showadd_fields.fields[index].error.msg&&showadd_fields.fields[index].error.flag"
+                style="color: red">{{showadd_fields.fields[index].error.msg}}</span>
             </div>
 
             <!--textarea-->
-            <div  v-if="item.type==='textarea'" v-show="!item.hidden"
+            <div :style="item.style? item.style:'height: 34px;'" v-if="item.type==='textarea'" 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-12 form-group']">
-              <label :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{item.label}}：</label>
-              <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-10'">
+              <label :style="item.label_style? item.label_style:''"
+                     :class="item.label_bootstraped?item.label_bootstraped+' control-label-justify control-label':item.label_style?'':'control-label-justify control-label col-sm-3'">{{item.label}}</label>
+              <div :style="item.value_style? item.value_style:''"
+                   :class="item.value_bootstraped?item.value_bootstraped:item.value_style?'':'col-sm-10'">
                 <textarea
                   :readonly="item.readonly"
                   :disabled="item.disabled"
                   class="form-control"
+                  style="background-color: #f7fbff;"
                   :rows="item.rows"
                   v-model="data.fields[index].value"
                   @change="disabled_check(data.fields[index].required,data.fields[index].value)"
@@ -66,10 +81,10 @@
             </div>
 
             <!--radio-->
-            <div   v-if="item.type==='radio'"
+            <div v-if="item.type==='radio'"
                  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-12 form-group']">
               <label v-if="item.label"
-                     :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{item.label}}：</label>
+                     :class="item.label_bootstraped?item.label_bootstraped+' control-label-justify control-label':'control-label-justify control-label col-sm-2'">{{item.label}}</label>
               <div
                 :class="item.value_bootstraped?item.value_bootstraped:item.items.length%2 == 0?'col-sm-5': 'col-sm-3'"
                 v-for="(index2,row) in item.items">
@@ -86,7 +101,8 @@
             <!--select-->
             <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 :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-6'">{{item.label}}：</label>
+              <label
+                :class="item.label_bootstraped?item.label_bootstraped+' control-label control-label-justify':'control-label-justify control-label col-sm-6'">{{item.label}}</label>
               <input-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"
@@ -99,9 +115,9 @@
             <div v-if="item.type==='checkbox'"
                  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-12 form-group']">
               <label v-if="item.label"
-                     :class="item.label_bootstraped?item.label_bootstraped+' control-label':'control-label col-sm-2'">{{item.label}}：</label>
+                     :class="item.label_bootstraped?item.label_bootstraped+' control-label ':'control-label col-sm-2'">{{item.label}}</label>
               <div style="margin-top: 6px"
-                   :class="item.value_bootstraped?item.value_bootstraped:'control-label col-sm-2'"
+                   :class="item.value_bootstraped?item.value_bootstraped:'control-label  col-sm-2'"
                    v-for="(index2,row) in item.items">
                 <label class="font-size form-group col-sm-6">{{row.label}}</label>
                 <input :readonly="item.readonly" :disabled="item.disabled" type="checkbox" class="col-sm-6"
@@ -110,22 +126,25 @@
             </div>
           </div>
           <!-- onetomany -->
-          <div class="col-sm-12"  v-for="(i,datagrid) in data.onetomany">
+          <div class="col-sm-12" v-for="(i,datagrid) in data.onetomany">
+            <h5 v-show="datagrid.title" style="text-align: center;color: darkcyan;background-color: #00A3F0">
+              {{datagrid.title}}</h5>
             <table v-show="!datagrid.hidden" class="table table-bordered table-striped table-hover">
-              <tr style="background-color: #00A3F0" >
+              <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">
                   <nobr><font color="white">{{labels.label}}</font></nobr>
                 </th>
-                <th style="text-align: center;border-color: #00A3F0;padding: 0px" >
-                  <button type="button" @click="$dispatch('add',i)" class="btn btn-warning" v-if="!data.onetomany[i].nopower">
+                <th style="text-align: center;border-color: #00A3F0;padding: 0px">
+                  <button type="button" @click="$dispatch('add',i)" class="btn btn-warning"
+                          v-if="!data.onetomany[i].nopower && showprint">
                     +
                   </button>
                 </th>
               </tr>
               <tr v-for="(j,row) in model.rows[i]">
                 <td style="text-align: center">{{$index+1}}</td>
-                <td  v-for="key in surBodyData[i]" style="text-align: center">
+                <td v-for="key in surBodyData[i]" style="text-align: center">
                   {{row[key]}}
                 </td>
                 <td style="text-align: center">
@@ -135,37 +154,41 @@
             </table>
           </div>
         </div>
-        <div class="col-sm-11 form-group">
-          <div class="form-group  col-sm-6">
-            <label class=" col-sm-4 control-label">所属公司：</label>
-            <div class="col-sm-5">
-              <input class="form-control" type="text" v-model="model.f_filiale" disabled>
+        <div class="col-sm-12 form-group text-center" style="padding-top:8px">
+          <div class="form-group  col-sm-3 center-block">
+            <label class=" col-sm-5 control-label control-label-justify">所属公司：</label>
+            <div class="col-sm-6">
+              <input style="width: 150px" class="form-control" type="text" v-model="model.f_filiale" disabled>
             </div>
           </div>
-          <div class="col-sm-6 form-group">
-            <label class="control-label col-sm-6">部门：</label>
-            <div class="col-sm-5">
-              <input type="text" class="form-control" disabled v-model="model.f_parentname"/>
+<!--          <div class="col-sm-1 form-group center-block">-->
+<!--          </div>-->
+          <div class="col-sm-3 form-group center-block">
+            <label class="control-label control-label-justify col-sm-5">部门：</label>
+            <div class="col-sm-6">
+              <input style="width: 150px" type="text" class="form-control" disabled v-model="model.f_parentname"/>
             </div>
           </div>
-        </div>
-        <div class="col-sm-11 form-group">
-          <div class="col-sm-6 form-group">
-            <label class="control-label col-sm-4">操作日期：</label>
-            <div class="col-sm-5">
-              <input type="text" class="form-control" disabled v-model="model.f_operate_date"/>
+<!--          <div class="col-sm-1 form-group center-block">-->
+<!--          </div>-->
+          <div class="col-sm-3 form-group center-block">
+            <label class="control-label control-label-justify col-sm-5">操作人：</label>
+            <div class="col-sm-6 ">
+              <input style="width: 150px" type="text" class="form-control" disabled v-model="model.f_operator"/>
             </div>
           </div>
-          <div class="col-sm-6 form-group">
-            <label class="control-label col-sm-6">操作人：</label>
-            <div class="col-sm-5">
-              <input type="text" class="form-control" disabled v-model="model.f_operator"/>
+<!--          <div class="col-sm-1 form-group center-block">-->
+<!--          </div>-->
+          <div class="col-sm-3 form-group center-block">
+            <label class="control-label control-label-justify col-sm-5">操作日期：</label>
+            <div class="col-sm-6">
+              <input style="width: 95px" type="text" class="form-control" disabled v-model="model.f_operate_date"/>
             </div>
           </div>
         </div>
       </form>
     </validator>
-    <div class="from-group col-sm-12">
+    <div class="from-group col-sm-11">
       <center>
         <!-- 按钮组 -->
         <button v-for="(index,button) in data.buttons"
@@ -205,49 +228,80 @@
 
 
     <!-- onetomany新增模态框 -->
-    <modal v-if="showadd" :show.sync="showadd" v-ref:modal backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="closemodal('新增')"><span>&times;</span></button>
-        <h4 class="modal-title">新增</h4>
-      </header>
-      <article slot="modal-body" class="modal-body">
-        <div class="col-sm-12" v-for="(index,showadd_field) in showadd_fields.fields">
-          <label v-show = "!showadd_field.hidden" class="control-label col-sm-3" style="margin-top: 10px">{{showadd_field.label}}：</label>
-          <div class="col-sm-7" v-show = "!showadd_field.hidden">
-            <!--时间datepicker-->
-            <div  v-if="showadd_field.type=='datepicker'"
-                 :class="[showadd_fields[index].required&&!(showadd_fields.fields[index].value) ? 'has-error' : '']">
-              <div >
-                <datepicker
-                  :placeholder="showadd_field.placeholder"
-                  :value.sync="showadd_fields.fields[index].value"
-                  :format="'yyyy-MM-dd HH:mm:ss'"
-                  v-model="showadd_fields.fields[index].value"
-                  :readonly=true
-                  :disabled="showadd_fields.fields[index].disabled"
-                  @blur="check_disable"
-                  :show-reset-button="reset">
-                </datepicker>
+    <div class="auto onetomanymodal"
+         style="z-index:8888;box-shadow: 0px 0px 100px 10px grey;position: fixed;"
+         v-if="showadd">
+
+      <div class="auto">
+
+        <div style="padding-top: 15px;padding-left: 15px;padding-right: 15px;">
+          <button type="button" class="close" @click="closemodal(modeltitle)"><span>&times;</span></button>
+          <span class="modal-title" style="border-bottom: 1px solid #e5e5e5;"><font
+            size="3">{{modeltitle}}</font></span>
+        </div>
+                   
+        <div style="padding-top: 15px;border-top: 0px solid #e5e5e5;border-bottom: 0px solid #e5e5e5;">
+          <div class="col-sm-12" v-for="(index,showadd_field) in showadd_fields.fields" v-if="refresh_modal">
+            <label v-show="!showadd_field.hidden" class="control-label  col-sm-3" style="margin-top: 10px">{{showadd_field.label}}：</label>
+            <div class="col-sm-7" v-show="!showadd_field.hidden">
+              <!--时间datepicker-->
+              <div v-if="showadd_field.type=='datepicker'"
+                   :class="[showadd_fields[index].required&&!(showadd_fields.fields[index].value) ? 'has-error' : '']">
+                <div>
+                  <datepicker
+                    @change="select_change_modal(index),disabled_check_modal(showadd_fields.fields[index].required,showadd_fields.fields[index].value)"
+                    @blur="check_disable_modal,disabled_check_modal(showadd_fields.fields[index].required,showadd_fields.fields[index].value)"
+                    :placeholder="showadd_field.placeholder"
+                    :value.sync="showadd_fields.fields[index].value"
+                    :format="'yyyy-MM-dd'"
+                    v-model="showadd_fields.fields[index].value"
+                    :readonly="showadd_fields.fields[index].readonly"
+                    :disabled="showadd_fields.fields[index].disabled"
+                    :show-reset-button="reset">
+                  </datepicker>
+                </div>
               </div>
+              <!--select-->
+              <input-select
+                @change="select_change_modal(index),disabled_check_modal(showadd_fields.fields[index].required,showadd_fields.fields[index].value)"
+                v-if="showadd_field.type=='select'"
+                @blur="check_disable_modal,disabled_check_modal(showadd_fields.fields[index].required,showadd_fields.fields[index].value)"
+                :mouseout="check_disable_modal,disabled_check_modal(showadd_fields.fields[index].required,showadd_fields.fields[index].value)"
+                :value.sync="showadd_fields.fields[index].value"
+                v-model="showadd_fields.fields[index].value"
+                :options='showadd_fields.fields[index].options'>
+              </input-select>
+              <!-- input -->
+              <input :type="showadd_field.type"
+                     @change="select_change_modal(index),check_disable_modal,disabled_check_modal(showadd_fields.fields[index].required,showadd_fields.fields[index].value)"
+                     v-if="(showadd_field.type=='input'||showadd_field.type=='number')&&!showadd_field.hidden"
+                     @blur="check_disable_modal,disabled_check_modal(showadd_fields.fields[index].required,showadd_fields.fields[index].value)"
+                     :mouseout="check_disable_modal,disabled_check_modal(showadd_fields.fields[index].required,showadd_fields.fields[index].value)"
+                     :readonly="showadd_field.readonly" class="form-control"
+                     v-model="showadd_fields.fields[index].value"
+                     :value.sync="showadd_fields[index].value"/>
+              <span
+                v-if="showadd_fields.fields[index].error&&showadd_fields.fields[index].error.msg&&showadd_fields.fields[index].error.flag"
+                style="color: red">{{showadd_fields.fields[index].error.msg}}</span>
             </div>
-            <!--select-->
-            <input-select  @change="select_change(index)"   v-if="showadd_field.type=='select'" :value.sync="showadd_fields[index].value"
-                          v-model="showadd_fields[index].value"
-                          :options='showadd_fields.fields[index].options'>
-            </input-select>
-            <!-- input -->
-            <input @change="select_change(index)" v-if="showadd_field.type=='input'&&!showadd_field.hidden" :readonly ="showadd_field.readonly"   class="form-control" v-model="showadd_fields[index].value"  :value.sync="showadd_fields[index].value"/>
           </div>
         </div>
-      </article>
-      <footer slot="modal-footer" style="border-top:none" class="modal-footer">
-        <button v-show="showadd" type="button" class="btn btn-primary" @click="acknowledge('新增')">确认</button>
-      </footer>
-    </modal>
+
+        <div style="padding-top: 15px;padding-left: 15px;padding-right: 15px;text-align: right;">
+          <button :class="disable_button_modal?'btn btn-default':'btn btn-primary'" v-show="showadd"
+                  :disabled="disable_button_modal" type="button" @click="acknowledge(modeltitle)">
+            确认
+          </button>
+        </div>
+
+      </div>
+       
+    </div>
+
   </div>
 </template>
 <script>
-import Vue from 'vue'
+  import Vue from 'vue'
   // Date格式化
   Date.prototype.Format = function (fmt) {
     var o = {
@@ -267,7 +321,15 @@ import Vue from 'vue'
 
   export default {
     title: '报建业务通用组件',
-    props: ['data'],
+    props: {
+      data: {
+        type: Object
+      },
+      showprint: {
+        type: Boolean,
+        default: true
+      }
+    },
     data() {
       return {
         data: {
@@ -275,10 +337,10 @@ import Vue from 'vue'
             fields: []
           }
         },
-        surBodyData:[],
+        surBodyData: [],
         refresh: true, // 控制重新渲染
         model: {
-          rows:[],
+          rows: [],
           button: {
             button_name: null,
             button_index: null
@@ -291,9 +353,13 @@ import Vue from 'vue'
         showadd: false, // onetomany 新增模态框
         showadd_fields: [],  // onetomany 新增模态框的字段配置
         data: null,
-        showadd_index:null,
+        modeltitle: '',
+        tempid: null,
+        showadd_index: null,
         showmodal: false,
-        disable_button: true
+        disable_button: true,
+        disable_button_modal: true,
+        refresh_modal: true
       }
     },
     created() {
@@ -301,26 +367,141 @@ import Vue from 'vue'
       this.initializtion()
     },
     events: {
-      'add'(index){
+      async 'add'(index) {
         let templet = new Object()
         templet = this.data.onetomany[index]
+        let count = 0
         for (let j = 0; j < templet.fields.length; j++) {
           templet.fields[j].value = ''
-          if(templet.fields[j].type == 'datepicker'){
-            templet.fields[j].value =  new Date().Format("yyyy-MM-dd HH:mm:ss")
+          if (templet.fields[j].type == 'datepicker') {
+            templet.fields[j].value = new Date().Format("yyyy-MM-dd")
+          }
+          if (templet.fields[j].required) {
+            count++
           }
         }
+        if (count == 0) {
+          this.disable_button_modal = false
+        }
+        this.modeltitle = '新增'
         this.showadd_fields = templet
         this.showadd_index = index
         this.showadd = true
       }
     },
     methods: {
+      // 获取组件中的数据
+      getmodel() {
+        // 组织model.fields数据
+        let modeldatas = {}
+        for (let i = 0; i < this.data.fields.length; i++) {
+          // checkbox特殊处理
+          if (this.data.fields[i].type === 'checkbox') {
+            for (let j = 0; j < this.data.fields[i].items.length; j++) {
+              modeldatas[this.data.fields[i].items[j].field] = this.data.fields[i].items[j].value
+            }
+          } else {
+            modeldatas[this.data.fields[i].field] = this.data.fields[i].value
+          }
+        }
+        modeldatas.f_process_id = this.data.f_process_id
+        modeldatas.f_filiale = this.model.f_filiale
+        modeldatas.f_parentname = this.model.f_parentname
+        modeldatas.f_operator = this.model.f_operator
+        modeldatas.f_operate_date = this.model.f_operate_date
+        return modeldatas
+      },
+      // 修改
+      revise(index, index2) {
+        this.showadd_fields = []
+        let templet = new Object()
+        templet = this.data.onetomany[index]
+        for (let j = 0; j < templet.fields.length; j++) {
+          if (templet.fields[j].type == 'input') {
+            templet[j] = {}
+            templet[j].value = this.model.rows[index][index2][templet.fields[j].field]
+            templet.fields[j].value = this.model.rows[index][index2][templet.fields[j].field]
+          } else {
+            templet.fields[j].value = this.model.rows[index][index2][templet.fields[j].field]
+            if (templet.fields[j].type == 'datepicker') {
+              templet.fields[j].value = new Date().Format("yyyy-MM-dd")
+            }
+          }
+        }
+        this.tempid = this.model.rows[index][index2].id
+        this.modeltitle = '修改'
+        this.showadd_fields = templet
+        this.showadd_index = index
+        this.showadd = true
+      },
+      // 检测模态框按钮的disable
+      disabled_check_modal(required, value) {
+        if (required && value) {
+          this.disable_button_modal = false
+
+          let fields = this.showadd_fields.fields
+          let flag = false
+          for (let i = 0; i < fields.length; i++) {
+            if (fields[i].type !== 'checkbox' && fields[i].required && !fields[i].value) {
+              flag = true
+            }
+          }
+          this.disable_button_modal = flag
+        }
+      },
+      // 检测模态框按钮的disable,反向检查
+      check_disable_modal() {
+        let fields = this.showadd_fields.fields
+        let flag = false
+        for (let i = 0; i < fields.length; i++) {
+          if (fields[i].type !== 'checkbox' && fields[i].required && !fields[i].value) {
+            flag = true
+          }
+        }
+        let count = 0
+        for (let i = 0; i < fields.length; i++) {
+          if (fields[i].type !== 'checkbox' && !fields[i].required) {
+            count++
+          }
+        }
+        if (count == 0) {
+          flag = false
+        }
+        this.disable_button_modal = flag
+      },
+      // 模态框监听
+      select_change_modal(index) {
+        if (this.showadd_fields.fields[index].value) {
+          this.showadd_fields[index] = {}
+          this.showadd_fields[index].value = this.showadd_fields.fields[index].value
+        } else if (this.showadd_fields[index] && this.showadd_fields[index].value) {
+          this.showadd_fields.fields[index].value = this.showadd_fields[index].value
+        }
+        this.refresh_modal = false
+        this.$nextTick(() => {
+          this.refresh_modal = true
+        })
+        this.$dispatch('select_cascade_modal', this.showadd_index, index)
+        if (this.showadd_fields.fields[index].type == 'datepicker' || this.showadd_fields.fields[index].error) {
+          this.$dispatch('modal_error_check', this.showadd_index, index)
+        }
+      },
+      // 更新showadd模态框
+      update_showadd_fields_value(index, value) {
+        this.showadd_fields.fields[index].value = value
+        this.showadd_fields[index] = {}
+        this.showadd_fields[index].value = value
+      },
+      // 清理showadd模态框
+      clear_showadd_fields_value(index) {
+        this.showadd_fields.fields[index].value = ''
+        this.showadd_fields[index].value = ''
+      },
       // 删除
-      delete(i,j){
-        this.$showMessage("您确定要删除这条记录吗？",['confirm']).then((res)=>{
-          if(res=='confirm'){
-            this.$dispatch('onetomanydelete',i,j)
+      delete(i, j) {
+        this.$showMessage("您确定要删除这条记录吗？", ['confirm']).then((res) => {
+          if (res == 'confirm') {
+            this.$dispatch('onetomanydelete', i, j)
           }
         })
       },
@@ -347,36 +528,36 @@ import Vue from 'vue'
             count++
           }
         }
-        if(count = 0){
+        if (count = 0) {
           flag = false
         }
         this.disable_button = flag
 
-        this.model.rows =[]
+        this.model.rows = []
         this.surBodyData = []
-        if(this.data.onetomany&&this.data.onetomany.length>0){
-          for(let i = 0; i<this.data.onetomany.length;i++){
+        if (this.data.onetomany && this.data.onetomany.length > 0) {
+          for (let i = 0; i < this.data.onetomany.length; i++) {
             let temp = []
-            for(let j = 0; j < this.data.onetomany[i].fields.length; j++){
+            for (let j = 0; j < this.data.onetomany[i].fields.length; j++) {
               temp.push(this.data.onetomany[i].fields[j].field)
             }
             this.surBodyData.push(temp)
           }
-          for(let i=0;i<this.data.onetomany.length;i++){
-            if(this.data.onetomany[i].rows){
+          for (let i = 0; i < this.data.onetomany.length; i++) {
+            if (this.data.onetomany[i].rows) {
               this.model.rows.push(this.data.onetomany[i].rows)
             }
           }
 
         }
         // datepicker 没有值给当时值
-        if (this.data.fields&&this.data.fields.length>0) {
+        if (this.data.fields && this.data.fields.length > 0) {
           for (let i = 0; i < this.data.fields.length; i++) {
             if (this.data.fields[i].type === 'datepicker' && !this.data.fields[i].value) {
-              this.data.fields[i].value = new Date().Format("yyyy-MM-dd HH:mm:ss")
+              this.data.fields[i].value = new Date().Format("yyyy-MM-dd")
             }
           }
-        }else {
+        } else {
           this.disable_button = false
         }
         if (this.data.filiale) {
@@ -392,7 +573,7 @@ import Vue from 'vue'
         if (this.data.operate_date) {
           this.model.f_operate_date = this.data.operate_date
         } else {
-          this.model.f_operate_date = new Date().Format("yyyy-MM-dd HH:mm:ss")
+          this.model.f_operate_date = new Date().Format("yyyy-MM-dd")
         }
         if (this.data.operator) {
           this.model.f_operator = this.data.operator
@@ -404,16 +585,15 @@ import Vue from 'vue'
       acknowledge(val) {
         if (val == '新增') {
           let temp = {}
-          for(let i=0;i<this.showadd_fields.fields.length;i++){
-            if(this.showadd_fields[i]){
-              temp[this.showadd_fields.fields[i].field] = this.showadd_fields[i].value
-            }else{
+          for (let i = 0; i < this.showadd_fields.fields.length; i++) {
+            if (this.showadd_fields.fields[i].value) {
               temp[this.showadd_fields.fields[i].field] = this.showadd_fields.fields[i].value
+            } else if (this.showadd_fields && this.showadd_fields[i] && this.showadd_fields[i].value) {
+              temp[this.showadd_fields.fields[i].field] = this.showadd_fields[i].value
             }
-
           }
           this.model.rows[this.showadd_index].push(temp)
-          this.$dispatch('confirm',this.data.onetomany[this.showadd_index].tables,temp,this.showadd_index,this.model.rows[this.showadd_index].length-1)
+          this.$dispatch('confirm', this.data.onetomany[this.showadd_index].tables, temp, this.showadd_index, this.model.rows[this.showadd_index].length - 1)
           this.showadd_fields = null
           this.showadd_index = null
           this.closemodal(val)
@@ -427,10 +607,28 @@ import Vue from 'vue'
       },
       // 关闭模态框
       closemodal(val) {
+        if (this.showadd_fields && this.showadd_fields.fields && this.showadd_fields.fields.length) {
+          for (let i = 0; i < this.showadd_fields.fields.length; i++) {
+            if (this.showadd_fields[i] && this.showadd_fields[i].value) {
+              this.showadd_fields[i].value = ''
+            }
+            if (this.showadd_fields.fields[i] && this.showadd_fields.fields[i].value) {
+              this.showadd_fields.fields[i].value = ''
+            }
+          }
+        }
+
+        if (val != '新增' || val != '修改' || val != '删除') {
+          this.disable_button = false
+        }
         this.showmodal = false
         if (val == '新增') {
           this.showadd = false
         }
+        this.showadd_fields = null
+        this.disable_button_modal = true
+        this.modeltitle = null
+        this.tempid = null
       },
       // 点击按钮
       clicked(index, button) {
@@ -441,6 +639,7 @@ import Vue from 'vue'
         //   temp['rows'] = this.model.rows
         //   this.$dispatch('onetomanyevent',temp)
         // }
+        this.disable_button = true
         console.log(`点击了按钮index:${index}+button:${JSON.stringify(button)}`);
         // 组织model.fields数据
         let modeldatas = {}
@@ -471,6 +670,9 @@ import Vue from 'vue'
         if (button.button_node) {
           buttondatas.button_node = button.button_node
         }
+        if (button.button_person) {
+          buttondatas.button_person = button.button_person
+        }
         buttondatas.button_name = button.button_name
         buttondatas.button_index = index
         if (button.button_fields) {
@@ -487,9 +689,13 @@ import Vue from 'vue'
           this.$dispatch('button', this.model)
         }
       },
-      // 级联操作预留
+      // 监听
       select_change(index) {
         this.$dispatch('select_cascade', index)
+        // 如果有错误信息提示走错误信息判断处理
+        if (this.data.fields[index].error || this.data.fields[index].type == 'datepicker') {
+          this.$dispatch('error_check', index)
+        }
       },
       // 检测按钮的disable
       disabled_check(required, value) {
@@ -522,7 +728,7 @@ import Vue from 'vue'
         if (this.data.operate_date) {
           this.model.f_operate_date = this.data.operate_date
         } else {
-          this.model.f_operate_date = new Date().Format("yyyy-MM-dd HH:mm:ss")
+          this.model.f_operate_date = new Date().Format("yyyy-MM-dd")
         }
         if (this.data.operator) {
           this.model.f_operator = this.data.operator
@@ -555,7 +761,7 @@ import Vue from 'vue'
             count++
           }
         }
-        if(count = 0){
+        if (count == 0) {
           flag = false
         }
         this.disable_button = flag
@@ -568,16 +774,47 @@ import Vue from 'vue'
   }
 </script>
 <style scoped>
-  th{
+  th {
+
+  }
+
+  .control-label-justify {
+    display: inline-block;
+    vertical-align: top;
+    width: 90px;
+    text-align: justify;
+    font-family: PingFang-SC-Bold;
   }
+
+  .control-label-justify::after {
+    content: "";
+    display: inline-block;
+    width: 70px;
+    overflow: hidden;
+    height: 0;
+  }
+
   input::-webkit-outer-spin-button,
   input::-webkit-inner-spin-button {
     -webkit-appearance: none;
   }
-  input[type="number"]{
+
+  input[type="number"] {
     -moz-appearance: textfield;
   }
-  tr{
+
+  .onetomanymodal {
+    background-color: #fff;
+    left: 40%;
+    margin: -300/2 0 0 -300/2;
+    position: fixed;
+    top: 15%;
+    width: 500px;
+    height: auto;
+    z-index: 25;
+  }
+
+  tr {
     height: 34px;
   }
 </style>