centaline-data-driven 1.3.40 → 1.3.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.3.40",
+  "version": "1.3.43",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/src/Detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="appDetail" style="height:100%;">
-    <ct-Detail :api="'PropertyRET/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailRET'"></ct-Detail>
+    <ct-Detail :api="'PropertyOFI/readDetailForBrowse'" :apiParam="apiParam" :pageType="'PropertyDetailOFI'"></ct-Detail>
     <ct-dialog-list></ct-dialog-list>
   </div>
 </template>
@@ -10,7 +10,7 @@
     name: 'DataDrivendetail',
     data() {
       return {        
-        apiParam: {actionType: 1,chanceID: "1524555083688316928"} ,
+        apiParam: {actionType: 1,chanceID: "1524955049590132736"} ,
       }
     },
     mounted() {

package/src/Form.vue

@@ -2,7 +2,7 @@
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :api="'/PropertyRET/getLayoutOfNew'" :apiParam="apiParam"></ct-form> -->
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/api/third-dept-tran/tran-comm-adjust/create'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <!-- <ct-form :api="'/api/third-dept-tran/transaction/detail'" :apiParam="apiParam"></ct-form> -->
     <ct-dialog-list></ct-dialog-list>
   </div>  
@@ -14,11 +14,11 @@
     data() {
       return {
         apiParam:{
-          actionType: 2,
-commAdjustCategory: "CC01020020",
-originalTraId: "1552533586416844802",
+          actionType: 3,
+originalTraId: "1554357607799558146",
 pageOnly: true,
 pageStyle: 2,
+pageTitle: "成交报告",
         },
         topHeight:10,
       }

package/src/centaline/dynamicComboBoxWithTextBox/src/dynamicComboBoxWithTextBox.vue

@@ -92,8 +92,10 @@
       }
       this.$watch('model.value', (n, o) => {
         if (typeof this.model.child !== 'undefined') {
-          this.model.child.value = this.model.child.defaultValue || '';
-          this.model.child.text = this.model.child.defaultText || '';
+          for (var item of this.model.child) {
+            item.value = item.defaultValue || '';
+            item.text = item.defaultText || '';
+          }
         }
       });
     },
@@ -111,13 +113,11 @@
 
         }
       },
-      maxlength4()
-      {
-         if(this.model.max4)
-         {
-           return parseInt(this.model.max4)
-         }
-         return 99999
+      maxlength4() {
+        if (this.model.max4) {
+          return parseInt(this.model.max4)
+        }
+        return 99999
 
       }
     },
@@ -136,8 +136,10 @@
       soChange: function () {
         var self = this;
         if (typeof this.model.child !== 'undefined') {
-          this.model.child.value = this.model.child.defaultValue || '';
-          this.model.child.text = this.model.child.defaultText || '';
+          for (var item of this.model.child) {
+            item.value = item.defaultValue || '';
+            item.text = item.defaultText || '';
+          }
         }
         this.inputHandler(self.model.value);
         this.changeHandler(self.model.value);
@@ -243,7 +245,7 @@
       position: relative;
     }
 
-  .ct-combobox-with-textbox .el-input.is-focus .el-input__inner {
-    border: 1px solid #409EFF !important;
-  }
+    .ct-combobox-with-textbox .el-input.is-focus .el-input__inner {
+      border: 1px solid #409EFF !important;
+    }
 </style>

package/src/centaline/dynamicContact/src/dynamicContact.vue

@@ -132,8 +132,10 @@ export default {
     soChange: function () {
       var self = this;
       if (typeof this.model.child !== 'undefined') {
-        this.model.child.value = this.model.child.defaultValue || '';
-        this.model.child.text = this.model.child.defaultText || '';
+        for (var item of this.model.child) {
+          item.value = item.defaultValue || '';
+          item.text = item.defaultText || '';
+        }
       }
       var currentOption = this.model.options.find((value) => {
         return self.model.value === value[self.model.optionAttrs.value];

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -11,6 +11,9 @@
             <span> {{ model.fields1Dic.BuildingName.value }}</span>
             <span>{{ model.fields1Dic.RoomNo.value }}</span>
             <img :src="model.actionRouterFavorite.imgUrl" alt="" @click="fieldClickHandler(model.actionRouterFavorite, $event)" class="collection" />
+            <component v-if="model.otherTradeActionRouter !== null" v-bind="model.otherTradeActionRouter" class="max-default w93"
+              :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi" style="margin-left: 10px;"
+              @click="fieldClickHandler(model.otherTradeActionRouter, $event)"></component>
           </div>
           <div class="title-other">
             <span>{{ model.fields1Dic.PropertyNo.label }}{{ model.fields1Dic.PropertyNo.value }}</span>
@@ -24,44 +27,23 @@
               {{ tag.label }}
             </div>
           </div>
-          <div
-            v-if="model.fields1Dic.PropertyDepict"
-            v-html="model.fields1Dic.PropertyDepict.value"
-            style="
-              font-weight: bold;
-              font-size: 13px;
-              margin-top: 10px;
-              background: rgb(236, 249, 255);
-              flex: 1;
-              align-items: center;
-              padding: 5px;
-              border-radius: 5px;
-            "
-          ></div>
+          <div v-if="model.fields1Dic.PropertyDepict" v-html="model.fields1Dic.PropertyDepict.value"
+            style=" font-weight: bold; font-size: 13px; margin-top: 10px; background: rgb(236, 249, 255);
+              flex: 1; align-items: center; padding: 5px; border-radius: 5px;">
+          </div>
         </div>
         <div class="head-but">
           <div>
-            <component v-if="model.otherTradeActionRouter !== null" v-bind="model.otherTradeActionRouter" class="max-default w93"
-              :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi"
-              @click="fieldClickHandler(model.otherTradeActionRouter, $event)"></component>
-            <img :class="{domDisabled:flagDisabledPrev,}" @click="clickPrevHandler"
-              src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 20px;cursor: pointer;"/>
-            <img :class="{domDisabled:flagDisabledNext,}" @click="clickNextHandler"
-              src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 15px;margin-right: 13px;cursor: pointer;"/>
-          </div>
-          <div class="mt5">
             <component class="max-report w93"
               v-if="model.actionRouters !== null && model.actionRouters[0] !== null"
               :is="model.actionRouters[0].is" :vmodel="model.actionRouters[0]" :api="model.optionApi"
-              @click="fieldClickHandler(model.actionRouters[0], $event)"
-            ></component>
+              @click="fieldClickHandler(model.actionRouters[0], $event)">
+            </component>
             <component class="max-report w93"
               v-if="model.actionRouters !== null && model.actionRouters[1] !== null"
               :is="model.actionRouters[1].is" :vmodel="model.actionRouters[1]" :api="model.optionApi"
-              @click="fieldClickHandler(model.actionRouters[1], $event)"
-            ></component>
-          </div>
-          <div class="mt5">
+              @click="fieldClickHandler(model.actionRouters[1], $event)">
+            </component>
             <button type="button" class="el-button el-button--info el-button--mini max-report rel w93"
               v-if="model.actionRoutersMoreList !== null && model.actionRoutersMoreList.length > 0">
               <img src="../../../assets/dian.png" alt="" class="report" />
@@ -76,6 +58,10 @@
               :is="model.actionRouters[2].is" :vmodel="model.actionRouters[2]" :api="model.optionApi"
               @click="fieldClickHandler(model.actionRouters[2], $event)">
             </component>
+            <img :class="{domDisabled:flagDisabledPrev,}" @click="clickPrevHandler"
+              src="../../../assets/T.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 10px;cursor: pointer;"/>
+            <img :class="{domDisabled:flagDisabledNext,}" @click="clickNextHandler"
+              src="../../../assets/B.png" alt="" style="width: 26px;height: 26px;vertical-align: bottom;margin-left: 10px;margin-right: 13px;cursor: pointer;"/>
           </div>
         </div>
       </div>
@@ -212,16 +198,56 @@
           </div>
           <div class="tablist-info base-box">
             <div class="details-tabs-box">
-              <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
-                <el-tab-pane v-for="(col, index) in model.tags1" :key="col.appID" :index="index.toString()" :name="index.toString()">
-                  <div slot="label" v-html="col.appName"></div>
-                </el-tab-pane>
-              </el-tabs>
-              <ct-searchlist v-if="model.searchConditionApiTags1" :key="'list' + listKey.toString() + refershKey" style="min-height: 420px;"
-                :apiParam="model.paramDataTags1" :flagFocus="false" :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1">
-              </ct-searchlist>
+              <!--计算占用宽度-->
+              <div style="position: relative">
+                <div ref="tabsbox" style="position: absolute; left: -10000px">
+                  <el-tabs>
+                    <el-tab-pane v-for="(col, index) in model.tags1" :key="col.appID" :index="index.toString()" :name="index.toString()">
+                      <div slot="label" v-html="col.appName" :ref="'StatisticsItem' + index"></div>
+                    </el-tab-pane>
+                  </el-tabs>
+                </div>
+              </div>
+              <!--展示-->
+              <div>
+                <div v-if="showData.length === 1">
+                  <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
+                    <el-tab-pane v-for="(col, index) in showData[0]" :key="col.appID" :index="index.toString()" :name="index.toString()">
+                      <div slot="label" v-html="col.appName"></div>
+                    </el-tab-pane>
+                  </el-tabs>
+                </div>
+                <div v-if="showData.length > 1" style="position: relative">
+                  <el-tabs :value="model.activeIndex1" @tab-click="handleSelect">
+                    <el-tab-pane v-for="(col, index) in showData[0]" :key="col.appID" :index="index.toString()" :name="index.toString()">
+                      <div slot="label" v-html="col.appName"></div>
+                    </el-tab-pane>
+                  </el-tabs>
+                  <div class="more-dropdown">
+                    <el-dropdown trigger="click" placement="bottom">
+                      <span class="el-dropdown-link svgIcon">
+                        <!-- <div class="my-icon-more"></div> -->
+                        <img :src="iconSort" alt="" width="100%" />
+                      </span>
+                      <el-dropdown-menu slot="dropdown" class="tabsMore">
+                        <el-dropdown-item v-for="(col, index) in showData[1]" :key="col.appID" :index="index.toString()"
+                          :name="index.toString()" :class="{ 'is-active': showData[0].length + index == model.activeIndex1,}">
+                          <div @click="handleDropDown(col, index)" :value="model.activeIndex1">
+                            <div slot="label" v-html="col.appName"></div>
+                          </div>
+                        </el-dropdown-item>
+                      </el-dropdown-menu>
+                    </el-dropdown>
+                  </div>
+                </div>
+                <ct-searchlist v-if="model.searchConditionApiTags1" :key="'list' + listKey.toString() + refershKey"
+                  style="min-height: 420px" :apiParam="model.paramDataTags1" :flagFocus="false"
+                  :searchConditionApi="model.searchConditionApiTags1" :searchDataApi="model.searchDataApiTags1">
+                </ct-searchlist>
+              </div>
             </div>
-          </div>
+</div>
+
           <div class="contribute-info base-box" v-if="model._commissionList !== null">
             <div class="title-l">贡献人信息</div>
             <div class="contribute-list">
@@ -523,6 +549,10 @@ export default {
       listKey: 0,
       flagDisabledPrev:false,
       flagDisabledNext:false,
+	    showData: [],
+      FlagStatistics: false,
+      dropDownSelected: false,
+      iconSort: require("../../../assets/sort.png"),
     };
   },
   mounted() {
@@ -558,6 +588,44 @@ export default {
     });
   },
   methods: {
+  showStats() {
+      var self = this;
+      this.$nextTick(function () {
+        if (self.model.tags1.length > 0) {
+          var showIndex = 0;
+          var sumWidth = 0;
+          for (var i = 0; i < self.model.tags1.length; i++) {
+            var moreWidth = 22;
+
+            sumWidth = sumWidth +  self.$refs["StatisticsItem" + i][0].offsetParent.offsetWidth;
+            var nextWidth = 0;
+            if (i + 1 < self.model.tags1.length) {
+              try {
+                nextWidth =  self.$refs["StatisticsItem" + (i + 1)][0].offsetParent.offsetWidth;
+              } catch (e) { }
+            } else {
+              moreWidth = 0;
+            }
+            if (self.model.midlWidth - 42 < sumWidth + moreWidth) {
+              showIndex = i;
+              break;
+            } else if (self.model.midlWidth - 42 < nextWidth + moreWidth) {
+              showIndex = i + 1;
+              break;
+            }
+          }
+          if (showIndex > 0) {
+            self.showData = [
+              self.model.tags1.slice(0, showIndex),
+              self.model.tags1.slice(showIndex),
+            ];
+          } else {
+            self.showData = [self.model.tags1];
+          }
+        }
+      });
+    },
+
     load(data) {
       var self = this;
       this.model = data;
@@ -666,6 +734,7 @@ export default {
           var w1 = this.$refs.detail.clientWidth | 0;
           var w2 = this.$refs.midr.clientWidth | 0;
           this.model.midlWidth = w1 - w2 - 10;
+		  this.showStats();
         }
       });
     },
@@ -681,6 +750,19 @@ export default {
         this.model.paramDataTags1 = this.model.tags1[i].paramData || "";
         window.localStorage.setItem("detailtagkey", this.model.tags1[i].appID); //存储
       }
+    },
+	 handleDropDown(key, index) {
+      let i = index;
+      this.model.activeIndex1 = (this.showData[0].length + i).toString();
+      let dropDownData = this.showData[1];
+      this.dropDownSelected = true;
+      if (dropDownData && dropDownData[i]) {
+        this.listKey = this.listKey + 1;
+        this.model.searchConditionApiTags1 = dropDownData[i].searchConditionApiUrl || "";
+        this.model.searchDataApiTags1 = dropDownData[i].searchDataApiUrl || "";
+        this.model.paramDataTags1 = dropDownData[i].paramData || "";
+        window.localStorage.setItem("detailtagkey", dropDownData[i].appID); //存储
+      }
     },
     fieldClickHandler(field) {
       var self = this;
@@ -1636,6 +1718,65 @@ export default {
 .r {
   float: right;
 }
+.my-icon-more {
+  width: 14px;
+  height: 15px;
+  border-top: 3px solid rgb(153, 153, 153);
+  border-bottom: 3px solid rgb(153, 153, 153);
+  background-color: rgb(153, 153, 153);
+  padding: 3px 0;
+  background-clip: content-box;
+  cursor: pointer;
+}
+>>>.el-tabs__nav-prev {
+  display: none;
+}
+
+>>>.el-tabs__nav-next {
+  display: none;
+}
+
+.more-dropdown {
+  position: absolute;
+  width: 16px;
+  height: 20px;
+  text-align: left;
+  top: 13px;
+  right: -1px;
+}
+
+.el-dropdown-menu--mini .el-dropdown-menu__item {
+  font-size: 14px;
+  font-weight: 700;
+  color: #303133;
+}
+
+.el-dropdown-menu__item:focus,
+.el-dropdown-menu__item:not(.is-disabled):hover {
+  background-color: #fff;
+  color: #ff503f;
+  border-bottom: 3px solid #ff503f;
+}
+
+.tabsMore .is-active {
+  cursor: pointer;
+  background-color: #fff;
+  color: #ff503f;
+  border-bottom: 3px solid #ff503f;
+}
+
+>>>.el-tabs--bottom .el-tabs__item.is-bottom:last-child,
+>>>.el-tabs--bottom .el-tabs__item.is-top:last-child,
+>>>.el-tabs--top .el-tabs__item.is-bottom:last-child,
+>>>.el-tabs--top .el-tabs__item.is-top:last-child {
+  padding-right: 15px;
+}
+
+.svgIcon {
+  width: 16px;
+  text-align: center;
+  cursor: pointer;
+}
 </style>
 
 

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -11,6 +11,10 @@
             <span> {{ model.fields1Dic.BuildingName.value }}</span>
             <span>{{ model.fields1Dic.RoomNo.value }}</span>
             <img :src="model.actionRouterFavorite.imgUrl" alt="" @click="fieldClickHandler(model.actionRouterFavorite, $event)" class="collection" />
+            <component v-if="model.otherTradeActionRouter !== null" v-bind="model.otherTradeActionRouter" class="max-default w93"
+              :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi" style="margin-left: 10px;"
+              @click="fieldClickHandler(model.otherTradeActionRouter, $event)">
+            </component>
           </div>
           <div class="title-other">
             <span>{{ model.fields1Dic.PropertyNo.label }}{{ model.fields1Dic.PropertyNo.value }}</span>
@@ -19,8 +23,7 @@
             <img :src="model.fields1Dic.LocationUrl.value" alt="" class="location"/>
           </div>
           <div class="title-tags">
-            <div class="t-tag"
-              v-for="(tag, index) in model.actionRouterLabel"  :key="index"
+            <div class="t-tag" v-for="(tag, index) in model.actionRouterLabel"  :key="index"
               :style="{ color: tag.textColor, backgroundColor: tag.bgColor,borderColor: tag.borderColor,}">
               {{ tag.label }}
             </div>
@@ -31,65 +34,33 @@
         </div>
         <div class="head-but">
           <div>
-            <component v-if="model.otherTradeActionRouter !== null" v-bind="model.otherTradeActionRouter" class="max-default w93"
-              :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi"
-              @click="fieldClickHandler(model.otherTradeActionRouter, $event)">
-            </component>
-            <img :class="{ domDisabled: flagDisabledPrev }" @click="clickPrevHandler"
-              src="../../../assets/T.png" alt=""
-              style=" width: 26px; height: 26px;vertical-align: bottom; margin-left: 20px;cursor: pointer;"/>
-            <img :class="{ domDisabled: flagDisabledNext }" @click="clickNextHandler"
-              src="../../../assets/B.png" alt=""
-              style=" width: 26px; height: 26px;vertical-align: bottom; margin-left: 15px; margin-right: 13px; cursor: pointer;"/>
-          </div>
-          <div class="mt5">
-            <component
-              class="max-report w93"
+            <component class="max-report w93"
               v-if=" model.actionRouters !== null && model.actionRouters[0] !== null"
-              :is="model.actionRouters[0].is"
-              :vmodel="model.actionRouters[0]"
-              :api="model.optionApi"
-              @click="fieldClickHandler(model.actionRouters[0], $event)"
-            ></component>
-            <component
-              class="max-report w93"
-              v-if="
-                model.actionRouters !== null && model.actionRouters[1] !== null
-              "
-              :is="model.actionRouters[1].is"
-              :vmodel="model.actionRouters[1]"
-              :api="model.optionApi"
-              @click="fieldClickHandler(model.actionRouters[1], $event)"
-            ></component>
-          </div>
-          <div class="mt5">
-            <button type="button"
-              class="el-button el-button--info el-button--mini max-report rel w93"
+              :is="model.actionRouters[0].is" :vmodel="model.actionRouters[0]" :api="model.optionApi"
+              @click="fieldClickHandler(model.actionRouters[0], $event)"></component>
+            <component class="max-report w93"
+              v-if="model.actionRouters !== null && model.actionRouters[1] !== null"
+              :is="model.actionRouters[1].is" :vmodel="model.actionRouters[1]" :api="model.optionApi"
+              @click="fieldClickHandler(model.actionRouters[1], $event)"></component>
+            <button type="button" class="el-button el-button--info el-button--mini max-report rel w93"
               v-if=" model.actionRoutersMoreList !== null && model.actionRoutersMoreList.length > 0">
               <img src="../../../assets/dian.png" alt="" class="report" />
               <ul class="report-cont">
-                <li v-for="(col, index) in model.actionRoutersMoreList"
-                  :key="index"
-                  v-if="col.show !== false">
-                  <component
-                    class="max-report w93"
-                    :is="col.is"
-                    :vmodel="col"
-                    :api="model.optionApi"
-                    @click="fieldClickHandler(col, $event)"
-                  ></component>
+                <li v-for="(col, index) in model.actionRoutersMoreList" :key="index" v-if="col.show !== false">
+                  <component class="max-report w93" :is="col.is" :vmodel="col" :api="model.optionApi" @click="fieldClickHandler(col, $event)"></component>
                 </li>
               </ul>
             </button>
-            <component
-              v-else-if=" model.actionRouters !== null && model.actionRouters.length === 3 "
-              class="max-report w93"
-              :is="model.actionRouters[2].is"
-              :vmodel="model.actionRouters[2]"
-              :api="model.optionApi"
-              @click="fieldClickHandler(model.actionRouters[2], $event)"
-            >
+            <component v-else-if=" model.actionRouters !== null && model.actionRouters.length === 3 " class="max-report w93"
+              :is="model.actionRouters[2].is" :vmodel="model.actionRouters[2]" :api="model.optionApi"
+              @click="fieldClickHandler(model.actionRouters[2], $event)">
             </component>
+            <img :class="{ domDisabled: flagDisabledPrev }" @click="clickPrevHandler"
+              src="../../../assets/T.png" alt=""
+              style=" width: 26px; height: 26px;vertical-align: bottom; margin-left: 10px;cursor: pointer;"/>
+            <img :class="{ domDisabled: flagDisabledNext }" @click="clickNextHandler"
+              src="../../../assets/B.png" alt=""
+              style=" width: 26px; height: 26px;vertical-align: bottom; margin-left: 10px; margin-right: 13px; cursor: pointer;"/>
           </div>
         </div>
       </div>
@@ -250,12 +221,10 @@
                               showData[0].length + index == model.activeIndex1,
                           }"
                         >
-                          <span
-                            @click="handleDropDown(col, index)"
-                            :value="model.activeIndex1"
-                            >{{ col.appName }}</span
-                          ></el-dropdown-item
-                        >
+                            <div @click="handleDropDown(col, index)" :value="model.activeIndex1">
+                            <div slot="label" v-html="col.appName"></div>
+                          </div>
+						  </el-dropdown-item>
                       </el-dropdown-menu>
                     </el-dropdown>
                   </div>
@@ -973,8 +942,7 @@ export default {
             };
             self.$common.openDialog(dialogOption);
           } 
-          else if (field.isFormPageInTab) {
-            // 外部框架tab页打开
+          else if (field.isFormPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common
               .getDataDrivenOpts()
@@ -986,23 +954,19 @@ export default {
                 field.dialogWidth
               );
           } 
-          else if (field.isSearchPageInTab) {
-            // 外部框架tab页打开
+          else if (field.isSearchPageInTab) {// 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
             self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
           } 
-          else if (field.isBrowserNewTab) {
-            // 浏览器打开
+          else if (field.isBrowserNewTab) {// 浏览器打开
             submitData = field.getActionPara(submitData).para;
             let query = self.$common.objectToQueryStr(submitData);
             window.open(field.action + query, "_blank");
           } 
-          else if (field.isOpenUrlInBrowse) {
-            // 浏览器打开
+          else if (field.isOpenUrlInBrowse) {// 浏览器打开
             window.open(submitData[field.submitFormField], "_blank");
           } 
-          else if (field.isSeeVoice) {
-            //看视频
+          else if (field.isSeeVoice) {//看视频
             self.$common.browseVideo(field, submitData);
           } 
           else {
@@ -1820,21 +1784,7 @@ export default {
   background-clip: content-box;
   cursor: pointer;
 }
-// .popovertablf span {
-//   display: inline-block;
-// }
-// .popoverbtnTab {
-//   font-size: 14px !important;
-//   font-weight: bold;
-//   cursor: pointer;
-//   float: left;
-//   list-style-type: none;
-//   padding: 0px 20px 0px 20px;
-// }
-// .popoverbtnTab:hover,
-// .popovertablf:hover {
-//   color: #ee5d56;
-// }
+
 >>> .el-tabs__nav-prev {
   display: none;
 }

package/src/centaline/dynamicForm/src/dynamicForm.vue

@@ -243,7 +243,8 @@
             return v1.id === v.parentName;
           });
           if (parent) {
-            parent.child = v;
+            parent.child = parent.child ? parent.child : [];
+            parent.child.push(v);
             v.parent = parent;
           }
         });
@@ -672,7 +673,7 @@
               checkMsg = "请先录入" + self.model.fieldsDic[v].label;
             }
             else {
-              checkMsg = "未配置：" + v;
+              checkMsg = "未读取到表单项(" + v+")的值";
             }
             check = false;
           }

package/src/centaline/dynamicForm/src/dynamicFormListTable.vue

@@ -43,7 +43,7 @@
             </el-table-column>
 
             <!--操作列-->
-            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" fixed="right">
+            <el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0">
               <template slot-scope="scope">
                 <span v-if="scope.row.edit || scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,true)">
                   {{scope.row.isSet?'保存':"修改"}}