1

src/components/SimpleTable/index.vue

@@ -8,7 +8,7 @@
           </el-tooltip>
         </template>
       </el-table-column>
-      <el-table-column v-if="dealedTableData.length && tableBtns.length" fixed="right" width="160" label="操作">
+      <el-table-column v-if="dealedTableData.length && tableBtns.length" fixed="right" width="240" label="操作">
         <template slot-scope="scope">
           <div class="hd-td">
             <el-scrollbar style="height: 100%">
@@ -253,7 +253,7 @@ export default {
       const sums = []
       columns.forEach((column, index) => {
         this.tableCols.forEach(p => {
-          if (column.property === p.columncode) {
+          if (column.property === p.columncode && p.enablecount) {
             const values = data.map(item => Number(item[column.property]))
             if (!values.every(value => isNaN(value))) {
               sums[index] = values.reduce((prev, curr) => {

src/components/publicPageForm/index.vue

@@ -6,7 +6,7 @@
           <el-form-item :rules="fromDataReq(item)" :prop="item.columncode" :label="item.columnname">
             <template v-if="item.dropdownlist ||item.dropdownlist == 0">
               <el-select class="input-shadow" size="small" filterable default-first-option style="width: 100%" v-model="tableForm[item.columncode]" @change="changeSelect(item.columncode, item)" placeholder="请选择" clearable @clear="tableForm[item.columncode] = ''">
-                <el-option v-for="itemParams in tableOptions[item.columncode]" :key="itemParams.pageconfigurationid" :label="itemParams.pagename" :value="itemParams.pageconfigurationid">
+                <el-option v-for="itemParams in tableOptions[item.columncode]" :key="itemParams[item['dropdownlistid']]" :label="itemParams[item['dropdownlistlable']]" :value="itemParams[item['dropdownlistid']]">
                 </el-option>
               </el-select>
             </template>

src/views/dataAccessPage/index.vue

@@ -68,7 +68,7 @@
             <el-button type="primary" @click="handleSave" :disabled="flag" size="small">保存</el-button>
           </div>
           <div class="demo-form">
-            <PublicPageForm :form-item="jqList" labelWidth="200px" form-type="horizontal" />
+            <PublicPageForm :form-item="jqList" :formData="dataObj" labelWidth="200px" form-type="horizontal" />
           </div>
         </div>
         <div style="height: calc(100% - 280px);overflow: hidden;" class="newService-content-right-bottom">

src/views/tablePage/index.vue

@@ -88,6 +88,7 @@ export default {
       tableOptions: {}, //表单数据下拉
       labelWidth: '120px', //表单文字距离
       fromDataReqCatch: [], //表单规则缓存
+      tableKey:null,//表格主键
     }
   },
   computed: {
@@ -183,6 +184,12 @@ export default {
             const formItemCopy = _.cloneDeep(returnData).filter((item) => item.isdisplay == 2 || item.isdisplay == 3);
             this.formItem = _.orderBy(formItemCopy, ['displaynumber'], ['asc']);
             this.tableCols = tableColsCopyOrder;
+            const columncode = returnData.find(
+              (item) => item.isprimarykey == 1
+            );
+            if (columncode && Object.keys(columncode).length) {
+              this.tableKey = columncode['columncode']
+            }
           }
         } else {
           this.$message.error("获取表头数据失败");
@@ -219,6 +226,9 @@ export default {
       this.tableType = "add";
       this.tableTitle = "新增";
       this.tableForm = {};
+      for(let key in this.pageQuery){
+        this.tableForm[key] = this.pageQuery[key]
+      }
     },
     //表格-编辑
     handleEdit (row) {
@@ -248,7 +258,7 @@ export default {
     },
     //表格-删除-确认
     tableRemove () {
-      this.generalDataReception(3, this.tableObj);
+      this.generalDataReception(3, this.tableObj,this.tableKey);
     },
     // 新增/编辑-取消
     submitClickClose (formName) {
@@ -258,7 +268,7 @@ export default {
     // 新增/编辑-确认
     submitClickHandler () {
       const flag = this.$refs["ruleForm"].submitClickHandler()
-      if (flag) this.tableType == "add" ? this.generalDataReception(1, this.tableForm) : this.generalDataReception(2, this.tableForm)
+      if (flag) this.tableType == "add" ? this.generalDataReception(1, this.tableForm) : this.generalDataReception(2, this.tableForm,this.tableKey)
     },
     formatChange (data, event, key) {
       const datas = []
@@ -527,4 +537,4 @@ export default {
     }
   }
 }
-</style>
+</style>