我是供应商

src/views/purchase/cert/supCertAddDialog.vue

@@ -7,109 +7,239 @@
                      :loading="loading">提交
           </el-button>
         </el-button-group>
-        <el-row>
+<!--        <el-row>-->
-          <el-col :span="3">
+<!--          <el-col :span="3">-->
-            <div class="ao-text">
+<!--            <div class="ao-text">-->
-              <span>证书名称：</span>
+<!--              <span>证书名称：</span>-->
-            </div>
+<!--            </div>-->
-          </el-col>
+<!--          </el-col>-->
-          <el-col :span="8">
+<!--          <el-col :span="8">-->
-            <el-form-item prop="name">
+<!--            <el-form-item prop="name">-->
-              <el-input v-model="formData.name" auto-complete="off" :disabled="formData.auditStatus == 1" :maxlength="30"></el-input>
+<!--              <el-input v-model="formData.name" auto-complete="off" :disabled="formData.auditStatus == 1" :maxlength="30"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+
+<!--          <el-col :span="3">-->
+<!--            <div class="ao-text">-->
+<!--              <span>证书编号：</span>-->
+<!--            </div>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item prop="code">-->
+<!--              <el-input v-model="formData.code" auto-complete="off" :disabled="formData.auditStatus == 1"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+
+<!--        <el-row>-->
+<!--          <el-col :span="3">-->
+<!--            <div class="ao-text">-->
+<!--              <span>生效期：</span>-->
+<!--            </div>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item prop="vailDate">-->
+
+<!--              <el-date-picker-->
+<!--                v-model="formData.vailDate"-->
+<!--                type="date"-->
+<!--                :disabled="formData.auditStatus == 1"-->
+<!--                value-format="yyyy-MM-dd"-->
+<!--                style="width: 100%"-->
+<!--                placeholder="请选择生效期">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+
+<!--          <el-col :span="3">-->
+<!--            <div class="ao-text">-->
+<!--              <span>失效期：</span>-->
+<!--            </div>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item prop="expireDate">-->
+
+<!--              <el-date-picker-->
+<!--                v-model="formData.expireDate"-->
+<!--                type="date"-->
+<!--                :disabled="formData.auditStatus == 1"-->
+<!--                value-format="yyyy-MM-dd"-->
+<!--                style="width: 100%"-->
+<!--                placeholder="请选择失效期">-->
+<!--              </el-date-picker>-->
+
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+
+
+<!--          <el-col :span="3">-->
+<!--            <div class="ao-text">-->
+<!--              <span>备注：</span>-->
+<!--            </div>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item prop="remark">-->
+<!--              <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+
+<!--        </el-row>-->
+
+<!--        &lt;!&ndash;                <el-row :gutter="20">&ndash;&gt;-->
+<!--        &lt;!&ndash;                    <el-col :span="4">&ndash;&gt;-->
+<!--        &lt;!&ndash;                    </el-col>&ndash;&gt;-->
+<!--        &lt;!&ndash;                    <el-col :span="16">&ndash;&gt;-->
+<!--        &lt;!&ndash;                        <div style="color: red">&ndash;&gt;-->
+<!--        &lt;!&ndash;                            需要上传档案为：营业执照电子档案，经营许可证电子档案，经营备案证电子档案，开户行电子档案。&ndash;&gt;-->
+<!--        &lt;!&ndash;                        </div>&ndash;&gt;-->
+<!--        &lt;!&ndash;                    </el-col>&ndash;&gt;-->
+<!--        &lt;!&ndash;                </el-row>&ndash;&gt;-->
+
+<!--        <el-row>-->
+<!--          <el-col :span="3">-->
+<!--            <div class="ao-text">-->
+<!--              <span>文件：</span>-->
+<!--            </div>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item>-->
+<!--              <el-upload-->
+<!--                :disabled="formData.auditStatus == 1"-->
+<!--                class="upload-demo"-->
+<!--                ref="upload"-->
+<!--                :action="this.uploadUrl"-->
+<!--                :on-preview="uploadHandlePreview"-->
+<!--                :on-remove="uploadHandleRemove"-->
+<!--                :headers="headers"-->
+<!--                :on-exceed="uploadHandleExceed"-->
+<!--                accept=".jpg,.png"-->
+<!--                :on-change="uploadOnchange"-->
+<!--                :on-success="uploadHandleSuccess"-->
+<!--                :on-error="uploadHandleError"-->
+<!--                :file-list="fileList"-->
+<!--                :data="{type:'image2'}"-->
+<!--                :auto-upload="true">-->
+<!--                <el-button slot="trigger" size="small" type="primary" :disabled="formData.auditStatus == 1">-->
+<!--                  {{ choiceFile }}-->
+<!--                </el-button>-->
+<!--                <div>只能上传 jpg,png 文件，且不超过 3 MB</div>-->
+<!--              </el-upload>-->
+<!--              &lt;!&ndash;                            <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"&ndash;&gt;-->
+<!--              &lt;!&ndash;                                       style="text-align:right"&ndash;&gt;-->
+<!--              &lt;!&ndash;                            >文件预览&ndash;&gt;-->
+<!--              &lt;!&ndash;                            </el-button&ndash;&gt;-->
+<!--              &lt;!&ndash;                            >&ndash;&gt;-->
+
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+        <template v-for="(itemRow, indexRow) in fromList">
+          <el-row :gutter="20" class="el-row" type="flex">
+            <template v-for="(item, index) in itemRow.list">
+              <el-col :span="item.width" class="el-col" type="flex">
+                <div class="text item">
+                  <el-form-item v-if="item.columnType =='input' && executeEval(row,item.expression,true)"  :rules="item.checkRulesObj" :prop="item.columnName">
+                            <span slot="label">
+                              {{item.columnDesc}}
+                            </span>
+                    <el-input
+                      v-model="formData[item.columnName]"
+                      :style="item.style"
+                      :size="item.size"
+                      :type="item.inputType"
+                      :placeholder="item.columnDesc"
+                      :disabled="executeEval(null,item.disabledFuc,false)"
+                      @change="executeFuc($event,item.clickFuc,'2')"
+                    ></el-input>
                   </el-form-item>
-          </el-col>
 
-          <el-col :span="3">
+                  <el-form-item v-if="item.columnType =='radio' && executeEval(row,item.expression,true)" :prop="item.columnName">
-            <div class="ao-text">
+                            <span slot="label">
-              <span>证书编号：</span>
+                              {{item.columnDesc}}
-            </div>
+                            </span>
-          </el-col>
+                    <el-radio-group :style="item.style" v-model="formData[item.columnName]">
-          <el-col :span="8">
+                      <el-radio
-            <el-form-item prop="code">
+                        v-for="dict in item.lableRuleObj"
-              <el-input v-model="formData.code" auto-complete="off" :disabled="formData.auditStatus == 1"></el-input>
+                        :key="parseInt(dict.value)"
+                        :label="parseInt(dict.value)"
+                        :disabled="executeEval(null,item.disabledFuc,false)"
+                      >{{dict.label}}</el-radio>
+                    </el-radio-group>
                   </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>生效期：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="vailDate">
 
-              <el-date-picker
+                  <el-form-item v-if="item.columnType =='select' && executeEval(row,item.expression,true)" :prop="item.columnName">
-                v-model="formData.vailDate"
+                            <span slot="label">
-                type="date"
+                              {{item.columnDesc}}
-                :disabled="formData.auditStatus == 1"
+                            </span>
-                value-format="yyyy-MM-dd"
+                    <el-select v-model="formData[item.columnName]"
-                style="width: 100%"
+                               :style="item.style"
-                placeholder="请选择生效期">
+                               :disabled="executeEval(null,item.disabledFuc,false)"
-              </el-date-picker>
+                    >
+                      <el-option
+                        v-for="dict in item.lableRuleObj"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                      />
+                    </el-select>
                   </el-form-item>
-          </el-col>
+                  <el-form-item v-if="item.columnType =='selectCustom' && executeEval(row,item.expression,true)" :prop="item.columnName">
-
+                            <span slot="label">
-          <el-col :span="3">
+                              {{item.columnDesc}}
-            <div class="ao-text">
+                            </span>
-              <span>失效期：</span>
+                    <el-radio-group v-model="formData[item.columnName]"
-            </div>
+                                    @change="handleCheckedChange"
-          </el-col>
+                                    :disabled="executeEval(null,item.disabledFuc,false)"
-          <el-col :span="8">
+                    >
-            <el-form-item prop="expireDate">
+                      <el-radio v-for="item in roles" :key="item.roleId" :label="item.roleId">{{
-
+                          item.roleName
+                        }}
+                      </el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='date' && executeEval(row,item.expression,true)"  :rules="item.checkRulesObj" :prop="item.columnName">
+                            <span slot="label">
+                              {{item.columnDesc}}
+                            </span>
                     <el-date-picker
-                v-model="formData.expireDate"
+                      v-model="formData[item.columnName]"
-                type="date"
+                      :style="item.style"
-                :disabled="formData.auditStatus == 1"
+                      :disabled="executeEval(null,item.disabledFuc,false)"
                       value-format="yyyy-MM-dd"
-                style="width: 100%"
+                      type="date"
-                placeholder="请选择失效期">
+                      :placeholder="item.columnDesc"
-              </el-date-picker>
+                    ></el-date-picker>
-
                   </el-form-item>
-          </el-col>
+                  <el-form-item v-if="item.columnType =='treeCustom' && executeEval(row,item.expression,true)" :prop="item.columnName">
-        </el-row>
+                            <span slot="label">
-        <el-row>
+                              {{item.columnDesc}}
-
+                            </span>
-
+                    <treeselect
-          <el-col :span="3">
+                      v-model="formData[item.columnName]"
-            <div class="ao-text">
+                      :options="menuOptions"
-              <span>备注：</span>
+                      :disabled="executeEval(null,item.disabledFuc,false)"
-            </div>
+                      :normalizer="normalizer"
-          </el-col>
+                      :show-count="true"
-          <el-col :span="8">
+                      :placeholder="item.columnName"
-            <el-form-item prop="remark">
+                    />
-              <el-input v-model="formData.remark" auto-complete="off" type="textarea" autosize></el-input>
                   </el-form-item>
+                </div>
               </el-col>
-
+            </template>
           </el-row>
-
+        </template>
-        <!--                <el-row :gutter="20">-->
-        <!--                    <el-col :span="4">-->
-        <!--                    </el-col>-->
-        <!--                    <el-col :span="16">-->
-        <!--                        <div style="color: red">-->
-        <!--                            需要上传档案为：营业执照电子档案，经营许可证电子档案，经营备案证电子档案，开户行电子档案。-->
-        <!--                        </div>-->
-        <!--                    </el-col>-->
-        <!--                </el-row>-->
-
         <el-row>
-          <el-col :span="3">
-            <div class="ao-text">
-              <span>文件：</span>
-            </div>
-          </el-col>
-          <el-col :span="8">
           <el-form-item>
+                    <span slot="label">
+                              文件
+                            </span>
             <el-upload
               :disabled="formData.auditStatus == 1"
               class="upload-demo"
               ref="upload"
-                :action="this.uploadUrl"
+              :action="uploadUrl"
               :on-preview="uploadHandlePreview"
               :on-remove="uploadHandleRemove"
               :headers="headers"
@@ -126,14 +256,7 @@
               </el-button>
               <div>只能上传 jpg,png 文件，且不超过 3 MB</div>
             </el-upload>
-              <!--                            <el-button type="primary" size="mini" icon="search" @click="toViewCompanyCert"-->
-              <!--                                       style="text-align:right"-->
-              <!--                            >文件预览-->
-              <!--                            </el-button-->
-              <!--                            >-->
-
           </el-form-item>
-          </el-col>
         </el-row>
       </el-card>
     </el-form>
@@ -146,6 +269,9 @@ import draggable from "vuedraggable";
 import store from "../../../store";
 import {insertCompanyCert, updateCompanyCert} from "../../../api/purchase/companyCert";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer"
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
 
 export default {
   name: "supCompanyCertAdd",
@@ -194,6 +320,10 @@ export default {
       loading: false,
       uploadUrl: "",
       fileList: [],
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableObj:[],
       headers: {},
       choiceFile: "选取文件",
 
@@ -348,6 +478,15 @@ export default {
       this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
       window.open(this.certFileUrl + this.formData.filePath);
     },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
   },
   filters: {},
   mounted() {
@@ -358,6 +497,13 @@ export default {
   },
   created() {
     this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
+    getHead("basicCompany","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
     this.headers = {
       ADMIN_ID: store.getters.adminId,
       ADMIN_TOKEN: store.getters.token,

src/views/supplier/company/basicCompany.vue

@@ -208,75 +208,162 @@
           border
           highlight-current-row
         >
+<!--          <el-table-column-->
+<!--            type="index"-->
+<!--            label="序号"-->
+<!--            width="50"-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column label="证书名称" prop="name"></el-table-column>-->
+<!--          <el-table-column label="证书编号" prop="code"></el-table-column>-->
+<!--          <el-table-column label="生效期" prop="vailDate"></el-table-column>-->
+<!--          <el-table-column label="失效期" prop="expireDate"></el-table-column>-->
+<!--          <el-table-column label="确认状态" prop="auditStatus" width="120">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-tag :type="scope.row.auditStatus | statusFilterType">-->
+<!--                {{ checkFlag[scope.row.auditStatus] }}-->
+<!--              </el-tag>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+<!--          <el-table-column-->
+<!--            label="确认说明"-->
+<!--            prop="auditComment"-->
+<!--            show-overflow-tooltip-->
+<!--          ></el-table-column>-->
+<!--          <el-table-column label="状态" prop="status" width="120">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-tag :type="scope.row.status | statusType">-->
+<!--                {{ statusFlag[scope.row.status] }}-->
+<!--              </el-tag>-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+
+<!--          <el-table-column label="备注" prop="remark"></el-table-column>-->
+
+<!--          <el-table-column label="操作" width="180">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button-->
+<!--                type="text"-->
+<!--                size="small"-->
+<!--                @click.native="addCert(scope.row)"-->
+<!--              >编辑-->
+<!--              </el-button-->
+<!--              >-->
+<!--              <el-button-->
+<!--                type="text"-->
+<!--                size="small"-->
+<!--                @click.native="showImgViewer(scope.row)"-->
+<!--              >预览-->
+<!--              </el-button-->
+<!--              >-->
+<!--              <el-button-->
+<!--                type="text"-->
+<!--                size="small"-->
+<!--                v-if="-->
+<!--                  scope.row.auditStatus == 0 ||-->
+<!--                  scope.row.auditStatus == 2 ||-->
+<!--                  scope.row.auditStatus == 6-->
+<!--                "-->
+<!--                @click.native="deleteCompanyCert(scope.row)"-->
+<!--              >删除-->
+<!--              </el-button-->
+<!--              >-->
+<!--              <el-button-->
+<!--                type="text"-->
+<!--                size="small"-->
+<!--                v-if="scope.row.auditStatus == 2"-->
+<!--                @click.native="explainCompanyCert(scope.row)"-->
+<!--              >说明-->
+<!--              </el-button-->
+<!--              >-->
+<!--            </template>-->
+<!--          </el-table-column>-->
+          <template v-for="(item, index) in tableHeader">
             <el-table-column
-            type="index"
+              v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
-            label="序号"
+              type="index" :label="item.columnDesc"></el-table-column>
-            width="50"
+            <el-table-column
+              v-if="item.columnType == 'selection'"
+              type="selection"
+              :width="item.width"
+              :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
             ></el-table-column>
-          <el-table-column label="证书名称" prop="name"></el-table-column>
+
-          <el-table-column label="证书编号" prop="code"></el-table-column>
+            <el-table-column
-          <el-table-column label="生效期" prop="vailDate"></el-table-column>
+              v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
-          <el-table-column label="失效期" prop="expireDate"></el-table-column>
+              :prop="item.columnName"
-          <el-table-column label="确认状态" prop="auditStatus" width="120">
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
               <template  slot-scope="scope">
-              <el-tag :type="scope.row.auditStatus | statusFilterType">
+                <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-                {{ checkFlag[scope.row.auditStatus] }}
-              </el-tag>
               </template>
             </el-table-column>
             <el-table-column
-            label="确认说明"
+              v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
-            prop="auditComment"
+              :prop="item.columnName"
-            show-overflow-tooltip
+              :label="item.columnDesc"
-          ></el-table-column>
+              :sortable="item.sort"
-          <el-table-column label="状态" prop="status" width="120">
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
               <template   slot-scope="scope">
-              <el-tag :type="scope.row.status | statusType">
+                <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
-                {{ statusFlag[scope.row.status] }}
-              </el-tag>
               </template>
             </el-table-column>
-
+            <el-table-column
-          <el-table-column label="备注" prop="remark"></el-table-column>
+              v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
-
+              :prop="item.columnName"
-          <el-table-column label="操作" width="180">
+              :label="item.columnDesc"
-            <template slot-scope="scope">
+              :sortable="item.sort"
-              <el-button
+              :width="item.width"
-                type="text"
+              :show-overflow-tooltip="item.tooltip"
-                size="small"
+              :key="item.columnName"
-                @click.native="addCert(scope.row)"
-              >编辑
-              </el-button
-              >
-              <el-button
-                type="text"
-                size="small"
-                @click.native="showImgViewer(scope.row)"
-              >预览
-              </el-button
             >
-              <el-button
+              <template   slot-scope="scope">
-                type="text"
+                <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
-                size="small"
+                  <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
-                v-if="
+                </el-tag>
-                  scope.row.auditStatus == 0 ||
+              </template>
-                  scope.row.auditStatus == 2 ||
+            </el-table-column>
-                  scope.row.auditStatus == 6
+            <el-table-column
-                "
+              v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
-                @click.native="deleteCompanyCert(scope.row)"
+              :prop="item.columnName"
-              >删除
+              :label="item.columnDesc"
-              </el-button
+              :width="item.width"
+              :key="item.columnName"
+              fixed="right"
             >
-              <el-button
+              <template slot-scope="scope">
-                type="text"
+                <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
-                size="small"
+                           :type="buttonItem.type"
-                v-if="scope.row.auditStatus == 2"
+                           :size="buttonItem.size"
-                @click.native="explainCompanyCert(scope.row)"
+                           :style="buttonItem.style"
-              >说明
+                           :key="buttonItem"
-              </el-button
+                           v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                           :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                           @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+                >{{ buttonItem.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
             >
+              <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
               </template>
             </el-table-column>
+          </template>
         </el-table>
 
         <el-image-viewer
@@ -363,6 +450,9 @@ import draggable from "vuedraggable";
 import {getCompany} from "@/api/supplier/company";
 import {previewImage} from "@/api/purchase/supCompany";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
 
 export default {
   name: "supCompanyEdit",
@@ -513,7 +603,14 @@ export default {
     };
   },
   created() {
+    getHead("basicCompany","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
       this.getCompanyInfo();
+    });
     this.headers = {
       ADMIN_ID: store.getters.adminId,
       ADMIN_TOKEN: store.getters.token,
@@ -647,22 +744,22 @@ export default {
       });
     },
 
-    showImgViewer(row) {
+    showImgViewer(_this,row) {
       // let newWindow = window.open();
       // newWindow.document.write(row.filePath)
-      this.certFileUrl =
+      _this.certFileUrl =
-        this.BASE_URL +
+        _this.BASE_URL +
         "/udiwms/image/register/file/getImage?type=image2&name=";
-      this.imgList = [];
+      _this.imgList = [];
       previewImage({
         imageUrl: row.filePath,
         certFileUrl: this.certFileUrl,
       }).then((response) => {
         if (response.code === 20000) {
-          this.imgList = response.data;
+          _this.imgList = response.data;
         }
         console.log(this.imgList);
-        this.imgViewerVisible = true;
+        _this.imgViewerVisible = true;
       });
       const m = (e) => {
         e.preventDefault();
@@ -696,17 +793,20 @@ export default {
       this.inputQuery.areaCode = value.toString();
     },
 
-    addCert(row) {
+    addCert(_this,row) {
-      if (this.$isNotBlank(row)) {
+      if(_this == null){
-        this.formName = 2;
+        _this = this
-        this.inputQuery.formData = row;
+      }
-        this.editTye = 2;
+      if (_this.$isNotBlank(row)) {
+        _this.formName = 2;
+        _this.inputQuery.formData = row;
+        _this.editTye = 2;
       } else {
-        this.formName = 1;
+        _this.formName = 1;
-        this.inputQuery.formData = {};
+        _this.inputQuery.formData = {};
-        this.editTye = 1;
+        _this.editTye = 1;
       }
-      this.addCertVisible = true;
+      _this.addCertVisible = true;
     },
 
     selectCert() {
@@ -739,46 +839,55 @@ export default {
           this.certList = [];
         });
     },
-    explainCompanyCert(row) {
+    explainCompanyCert(_this,row) {
-      this.$confirm(row.auditComment, "拒绝原因", {
+      _this.$confirm(row.auditComment, "拒绝原因", {
         confirmButtonText: "确定",
         type: "warning",
         showCancelButton: false,
       }).then(() => {
       });
     },
-    deleteCompanyCert(row) {
+    deleteCompanyCert(_this,row) {
-      this.$confirm("是否删除?", "提示", {
+      _this.$confirm("是否删除?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          this.certLoading = true;
+          _this.certLoading = true;
           let tquery = {
             id: row.id,
             filePath: row.filePath,
           };
           deleteCompanyCert(tquery)
             .then((response) => {
-              this.certLoading = false;
+              _this.certLoading = false;
               if (response.code === 20000) {
-                this.getCompanyCertList();
+                _this.getCompanyCertList();
-                this.$message({
+                _this.$message({
                   type: "success",
                   message: "删除成功！",
                 });
               } else {
-                this.$message.error(response.message);
+                _this.$message.error(response.message);
               }
             })
             .catch(() => {
-              this.certLoading = false;
+              _this.certLoading = false;
             });
         })
         .catch(() => {
         });
     },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
   },
   filters: {
     statusFilterType(status) {
@@ -800,6 +909,7 @@ export default {
       return statusMap[status];
     },
   },
+
 };
 </script>
 <style>

src/views/supplier/company/basicCompanyProducts.vue

@@ -1106,7 +1106,8 @@ export default {
   ,
   created() {
     this.findBasicProductSet();
-    this.getList();getHead("basicCompanyProducts","1").then((re) => {
+
+    getHead("basicCompanyProducts","1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;

src/views/system/customConfig/configFromDetail.vue

@@ -43,6 +43,8 @@
         <el-table-column prop="checkRules" show-overflow-tooltip="true" label="验证规则"></el-table-column>
         <el-table-column prop="inputType" label="input类型"></el-table-column>
         <el-table-column prop="clickFuc" label="内容改变事件"></el-table-column>
+        <el-table-column prop="disabledFuc" label="禁用eval表达式"></el-table-column>
+        <el-table-column prop="expression" label="是否展示eval表达式"></el-table-column>
          <el-table-column prop="dataFuc" label="获取数据接口"></el-table-column>
          <el-table-column label="下拉框显示内容" prop="isShowXx">
            <template slot-scope="scope">
@@ -101,8 +103,9 @@
                 <el-option label="下拉框" value="select" />
                 <el-option label="单选框" value="radio" />
                 <el-option label="远程搜索" value="selectServer" />
-                <el-option label="树状自定以" value="treeCustom" />
+                <el-option label="树状自定义" value="treeCustom" />
                 <el-option label="时间选择" value="date" />
+                <el-option label="上传" value="upload" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -223,6 +226,24 @@
             </el-form-item>
           </el-col>
 
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="12" class="el-col">
+            <el-form-item label="禁用eval表达式" prop="clickFuc" class="query-form-item">
+              <el-input v-model="subData.disabledFuc" style="width: 80%" placeholder="请输入禁用eval表达式"
+                        auto-complete="off"></el-input>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="12" class="el-col">
+            <el-form-item label="是否展示eval表达式" prop="expression" class="query-form-item">
+              <el-input v-model="subData.expression" style="width: 80%" placeholder="请输入是否展示eval表达式"
+                        auto-complete="off"></el-input>
+            </el-form-item>
+          </el-col>
+
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
                 <el-col :span="12" class="el-col">
@@ -336,6 +357,7 @@
           "selectServer": "远程搜索",
           "date":"时间选择",
           "treeCustom":"树状自定义",
+          "upload":"上传",
         },
       };
     },