From 8495528a5284d0d0a483b572a218cb99d1bbef1f Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Mon, 31 Oct 2022 10:48:10 +0800
Subject: [PATCH] 11

---
 src/views/modules/cpts/base/cpts/edit.vue     | 462 ++++++++----------
 .../shequzhili/tuceng/anquan/xuncha/index.vue |  30 +-
 2 files changed, 231 insertions(+), 261 deletions(-)

diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue
index f3989e228..aff0551d4 100644
--- a/src/views/modules/cpts/base/cpts/edit.vue
+++ b/src/views/modules/cpts/base/cpts/edit.vue
@@ -1,273 +1,237 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-      <el-form
-        v-if="iniLoaded"
-        ref="ref_form"
-        :model="fmData"
-        :inline="true"
-        :disabled="formType === 'watch'"
-        class="m-fm"
-        :class="{ 'z-div': editParamsDiv, 'z-watch': formType === 'watch' }"
-      >
+      <el-form v-if="iniLoaded"
+               ref="ref_form"
+               :model="fmData"
+               :inline="true"
+               :disabled="formType === 'watch'"
+               class="m-fm"
+               :class="{ 'z-div': editParamsDiv, 'z-watch': formType === 'watch' }">
         <div class="list">
-          <el-form-item
-            v-for="item in editParams"
-            class="item"
-            label-width="140px"
-            style="display: block"
-            :key="'edit' + item.keyName"
-            :label="item.field"
-            :prop="item.keyName"
-            :rules="item.rules || []"
-          >
+          <el-form-item v-for="item in editParams"
+                        class="item"
+                        label-width="140px"
+                        style="display: block"
+                        :key="'edit' + item.keyName"
+                        :label="item.field"
+                        :prop="item.keyName"
+                        :rules="item.rules || []">
             <template v-if="item.type == 'switch'">
-              <el-switch
-                v-model="fmData[item.keyName]"
-                size="small"
-                :active-text="item.activeText || ''"
-                :inactive-text="item.inactiveText || ''"
-                :active-value="item.activeValue || true"
-                :inactive-value="item.inactiveValue || false"
-              >
+              <el-switch v-model="fmData[item.keyName]"
+                         size="small"
+                         :active-text="item.activeText || ''"
+                         :inactive-text="item.inactiveText || ''"
+                         :active-value="item.activeValue || true"
+                         :inactive-value="item.inactiveValue || false">
               </el-switch>
             </template>
 
             <template v-if="item.type == 'input'">
-              <el-input
-                v-if="
+              <el-input v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                v-model="fmData[item.keyName]"
-                class="item-input"
-                size="small"
-                clearable
-                show-word-limit
-                :maxlength="item.maxlength || ''"
-                :placeholder="item.placeholder || '请输入'"
-              >
+                        v-model="fmData[item.keyName]"
+                        class="item-input"
+                        size="small"
+                        clearable
+                        show-word-limit
+                        :maxlength="item.maxlength || ''"
+                        :placeholder="item.placeholder || '请输入'">
               </el-input>
 
-              <div class="item-show" v-else>
+              <div class="item-show"
+                   v-else>
                 {{ fmData[item.keyName] || "--" }}
+                <span v-if="item.attach">{{item.attach}}</span>
               </div>
             </template>
 
             <template v-if="item.type == 'textarea'">
-              <el-input
-                v-if="
+              <el-input v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                v-model="fmData[item.keyName]"
-                type="textarea"
-                class="item-input"
-                size="small"
-                clearable
-                show-word-limit
-                :rows="3"
-                :maxlength="item.maxlength || ''"
-                :placeholder="item.placeholder || '请输入'"
-              >
+                        v-model="fmData[item.keyName]"
+                        type="textarea"
+                        class="item-input"
+                        size="small"
+                        clearable
+                        show-word-limit
+                        :rows="3"
+                        :maxlength="item.maxlength || ''"
+                        :placeholder="item.placeholder || '请输入'">
               </el-input>
 
-              <div class="item-show" v-else>
+              <div class="item-show"
+                   v-else>
                 {{ fmData[item.keyName] || "--" }}
               </div>
             </template>
 
             <template v-if="item.type == 'date'">
-              <el-date-picker
-                v-if="
+              <el-date-picker v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                v-model="fmData[item.keyName]"
-                :picker-options="item.pickerOptions"
-                class="item-input"
-                size="small"
-                clearable
-                show-word-limit
-                :value-format="item.format || 'yyyy-MM-dd'"
-                :placeholder="item.placeholder || '请输入'"
-              >
+                              v-model="fmData[item.keyName]"
+                              :picker-options="item.pickerOptions"
+                              class="item-input"
+                              size="small"
+                              clearable
+                              show-word-limit
+                              :value-format="item.format || 'yyyy-MM-dd'"
+                              :placeholder="item.placeholder || '请输入'">
               </el-date-picker>
 
-              <div class="item-show" v-else>
+              <div class="item-show"
+                   v-else>
                 {{ fmData[item.keyName] || "--" }}
               </div>
             </template>
 
             <template v-if="item.type == 'number'">
-              <el-input-number
-                v-if="
+              <el-input-number v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                v-model="fmData[item.keyName]"
-                class="item-number"
-                size="small"
-                clearable
-                :precision="item.precision || 0"
-                :step="item.step || 1"
-                :min="item.min || 0"
-                :max="item.max || 999999999999"
-                :placeholder="item.placeholder || '请输入'"
-              >
+                               v-model="fmData[item.keyName]"
+                               class="item-number"
+                               size="small"
+                               clearable
+                               :precision="item.precision || 0"
+                               :step="item.step || 1"
+                               :min="item.min || 0"
+                               :max="item.max || 999999999999"
+                               :placeholder="item.placeholder || '请输入'">
               </el-input-number>
-              <span class="item-show" v-else>
+              <span class="item-show"
+                    v-else>
                 {{ fmData[item.keyName] || "--" }}
               </span>
               <span v-if="item.unitName">（{{ item.unitName }}）</span>
             </template>
 
             <template v-else-if="item.type == 'select'">
-              <el-select
-                v-model="fmData[item.keyName]"
-                :placeholder="item.placeholder || '请选择'"
-                size="small"
-                clearable
-                class="item-select"
-                :multiple="item.multiple || false"
-                :filterable="item.filterable || false"
-                :allowCreate="item.allowCreate || false"
-                :collapse-tags="item.collapseTags || false"
-                default-first-option
-                @change="(e) => handleChangeSelect(e, item)"
-              >
+              <el-select v-model="fmData[item.keyName]"
+                         :placeholder="item.placeholder || '请选择'"
+                         size="small"
+                         clearable
+                         class="item-select"
+                         :multiple="item.multiple || false"
+                         :filterable="item.filterable || false"
+                         :allowCreate="item.allowCreate || false"
+                         :collapse-tags="item.collapseTags || false"
+                         default-first-option
+                         @change="(e) => handleChangeSelect(e, item)">
                 <template v-if="item.optionType == 'group'">
-                  <el-option-group
-                    v-for="group in item.optionList"
-                    :key="group.label"
-                    :label="group.label"
-                  >
-                    <el-option
-                      v-for="subItem in group.optionList"
-                      :key="subItem.value"
-                      :label="subItem.label"
-                      :value="subItem.value"
-                    >
+                  <el-option-group v-for="group in item.optionList"
+                                   :key="group.label"
+                                   :label="group.label">
+                    <el-option v-for="subItem in group.optionList"
+                               :key="subItem.value"
+                               :label="subItem.label"
+                               :value="subItem.value">
                     </el-option>
                   </el-option-group>
                 </template>
                 <template v-else>
-                  <el-option
-                    v-for="(subItem, subIndex) in item.optionList"
-                    :key="subItem.value + subIndex"
-                    :label="subItem.label"
-                    :value="subItem.value"
-                  >
+                  <el-option v-for="(subItem, subIndex) in item.optionList"
+                             :key="subItem.value + subIndex"
+                             :label="subItem.label"
+                             :value="subItem.value">
                   </el-option>
                 </template>
               </el-select>
             </template>
 
             <template v-else-if="item.type == 'rich-text'">
-              <div
-                v-if="
+              <div v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                class="item-rich-text"
-              >
-                <Tinymce
-                  :ref="'richText' + item.keyName"
-                  v-model="fmData[item.keyName]"
-                  :customerId="customerId"
-                  :placeholder="item.placeholder || '请输入'"
-                  :height="500"
-                />
+                   class="item-rich-text">
+                <Tinymce :ref="'richText' + item.keyName"
+                         v-model="fmData[item.keyName]"
+                         :customerId="customerId"
+                         :placeholder="item.placeholder || '请输入'"
+                         :height="500" />
               </div>
-              <div
-                v-else
-                class="item-rich-text z-show"
-                @click="handleClickHtmlNode"
-              >
+              <div v-else
+                   class="item-rich-text z-show"
+                   @click="handleClickHtmlNode">
                 <div v-html="fmData[item.keyName]"></div>
               </div>
             </template>
 
             <template v-else-if="item.type == 'cascader'">
-              <el-cascader
-                v-model="fmData[item.keyName]"
-                :placeholder="item.placeholder || '请选择'"
-                :options="item.optionList"
-                :props="item.optionProps || {}"
-                :show-all-levels="false"
-                :collapse-tags="item.collapseTags || false"
-                size="small"
-                clearable
-                class="item-select"
-                @change="(e) => handleChangeCascader(e, item)"
-              >
+              <el-cascader v-model="fmData[item.keyName]"
+                           :placeholder="item.placeholder || '请选择'"
+                           :options="item.optionList"
+                           :props="item.optionProps || {}"
+                           :show-all-levels="false"
+                           :collapse-tags="item.collapseTags || false"
+                           size="small"
+                           clearable
+                           class="item-select"
+                           @change="(e) => handleChangeCascader(e, item)">
               </el-cascader>
             </template>
 
             <template v-else-if="item.type == 'upload'">
-              <el-upload
-                :headers="$getElUploadHeaders()"
-                v-if="
+              <el-upload :headers="$getElUploadHeaders()"
+                         v-if="
                   formType == 'add' || (formType == 'edit' && !item.editDisable)
                 "
-                ref="upload"
-                class="avatar-uploader"
-                :class="{ 'z-full': fmData[item.keyName].length >= item.limit }"
-                :action="item.uploadUrl || uploadUrl"
-                :data="{ customerId: customerId }"
-                :show-file-list="true"
-                :list-type="item.listType || 'picture'"
-                :limit="item.limit || 100"
-                :file-list="fmData[item.keyName]"
-                :on-success="(res, file) => handleImgSuccess(res, file, item)"
-                :on-error="(res, file) => handleImgError(res, file, item)"
-                :on-remove="(res) => handleImgRemove(res, item)"
-                :on-exceed="(res) => handleImgExceed(res, item)"
-                :before-upload="(file) => beforeImgUpload(file, item)"
-              >
+                         ref="upload"
+                         class="avatar-uploader"
+                         :class="{ 'z-full': fmData[item.keyName].length >= item.limit }"
+                         :action="item.uploadUrl || uploadUrl"
+                         :data="{ customerId: customerId }"
+                         :show-file-list="true"
+                         :list-type="item.listType || 'picture'"
+                         :limit="item.limit || 100"
+                         :file-list="fmData[item.keyName]"
+                         :on-success="(res, file) => handleImgSuccess(res, file, item)"
+                         :on-error="(res, file) => handleImgError(res, file, item)"
+                         :on-remove="(res) => handleImgRemove(res, item)"
+                         :on-exceed="(res) => handleImgExceed(res, item)"
+                         :before-upload="(file) => beforeImgUpload(file, item)">
                 <a><i class="el-icon-plus"></i> 点击上传</a>
               </el-upload>
-              <el-image
-                v-else-if="fmData[item.keyName].length > 0"
-                style="width: 100px; height: 100px"
-                :src="fmData[item.keyName][0].url"
-                fit="cover"
-                :preview-src-list="fmData[item.keyName].map((item) => item.url)"
-              ></el-image>
+              <el-image v-else-if="fmData[item.keyName].length > 0"
+                        style="width: 100px; height: 100px"
+                        :src="fmData[item.keyName][0].url"
+                        fit="cover"
+                        :preview-src-list="fmData[item.keyName].map((item) => item.url)"></el-image>
               <span v-else>--</span>
             </template>
 
             <template v-else-if="item.type == 'address'">
               <div class="address-item">
-                <el-input
-                  class="address-item-input"
-                  :placeholder="item.placeholder || '请输入所在地址'"
-                  v-model="fmData[item.keyName]"
-                  :maxlength="item.maxlength || ''"
-                  show-word-limit
-                  size="small"
-                >
+                <el-input class="address-item-input"
+                          :placeholder="item.placeholder || '请输入所在地址'"
+                          v-model="fmData[item.keyName]"
+                          :maxlength="item.maxlength || ''"
+                          show-word-limit
+                          size="small">
                 </el-input>
-                <el-button
-                  style="margin-left: 10px"
-                  type="default"
-                  size="small"
-                  ref="mapSearch"
-                  @click="handleSearchMap(item)"
-                  >查询</el-button
-                >
-                <div id="app" class="div_map"></div>
-                <div style="margin-top: 10px" v-show="false">
+                <el-button style="margin-left: 10px"
+                           type="default"
+                           size="small"
+                           ref="mapSearch"
+                           @click="handleSearchMap(item)">查询</el-button>
+                <div id="app"
+                     class="div_map"></div>
+                <div style="margin-top: 10px"
+                     v-show="false">
                   <span>经度</span>
-                  <el-input
-                    class="address-item-input2"
-                    maxlength="50"
-                    placeholder="请输入经度"
-                    v-model="fmData[item.supKeys[0]]"
-                  >
+                  <el-input class="address-item-input2"
+                            maxlength="50"
+                            placeholder="请输入经度"
+                            v-model="fmData[item.supKeys[0]]">
                   </el-input>
                   <span style="margin-left: 20px">纬度</span>
-                  <el-input
-                    class="address-item-input2"
-                    maxlength="50"
-                    placeholder="请输入纬度"
-                    v-model="fmData[item.supKeys[1]]"
-                  >
+                  <el-input class="address-item-input2"
+                            maxlength="50"
+                            placeholder="请输入纬度"
+                            v-model="fmData[item.supKeys[1]]">
                   </el-input>
                 </div>
               </div>
@@ -276,52 +240,44 @@
         </div>
       </el-form>
 
-      <div class="div_btn resi-btns" v-if="!formBtnFixed">
-        <el-button size="small" @click="handleCancle">{{
+      <div class="div_btn resi-btns"
+           v-if="!formBtnFixed">
+        <el-button size="small"
+                   @click="handleCancle">{{
           editConfig.cancelBtnName || "取消"
         }}</el-button>
-        <el-button
-          v-if="formType != 'watch'"
-          type="primary"
-          size="small"
-          :disabled="btnDisable"
-          @click="handleComfirm"
-          >{{ editConfig.confirmBtnName || "确定" }}</el-button
-        >
-        <slot
-          name="operateSup"
-          v-bind:id="formId"
-          v-bind:info="fmData"
-          v-bind:formType="formType"
-        ></slot>
+        <el-button v-if="formType != 'watch'"
+                   type="primary"
+                   size="small"
+                   :disabled="btnDisable"
+                   @click="handleComfirm">{{ editConfig.confirmBtnName || "确定" }}</el-button>
+        <slot name="operateSup"
+              v-bind:id="formId"
+              v-bind:info="fmData"
+              v-bind:formType="formType"></slot>
       </div>
 
-      <slot
-        name="bottomSup"
-        v-bind:id="formId"
-        v-bind:info="fmData"
-        v-bind:formType="formType"
-      ></slot>
+      <slot name="bottomSup"
+            v-bind:id="formId"
+            v-bind:info="fmData"
+            v-bind:formType="formType"></slot>
     </div>
 
-    <div class="div_btn resi-btns" v-if="formBtnFixed">
-      <el-button size="small" @click="handleCancle">{{
+    <div class="div_btn resi-btns"
+         v-if="formBtnFixed">
+      <el-button size="small"
+                 @click="handleCancle">{{
         editConfig.cancelBtnName || "取消"
       }}</el-button>
-      <el-button
-        v-if="formType != 'watch'"
-        type="primary"
-        size="small"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >{{ editConfig.confirmBtnName || "确定" }}</el-button
-      >
-      <slot
-        name="operateSup"
-        v-bind:id="formId"
-        v-bind:info="fmData"
-        v-bind:formType="formType"
-      ></slot>
+      <el-button v-if="formType != 'watch'"
+                 type="primary"
+                 size="small"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">{{ editConfig.confirmBtnName || "确定" }}</el-button>
+      <slot name="operateSup"
+            v-bind:id="formId"
+            v-bind:info="fmData"
+            v-bind:formType="formType"></slot>
     </div>
   </div>
 </template>
@@ -397,7 +353,7 @@ export default {
     },
   },
 
-  data() {
+  data () {
     return {
       iniLoaded: false,
 
@@ -415,19 +371,19 @@ export default {
   computed: {},
   watch: {
     editParams: {
-      handler() {
+      handler () {
         this.computeFmData();
       },
       deep: true,
     },
   },
 
-  async mounted() {
+  async mounted () {
     this.initForm();
   },
 
   methods: {
-    async initForm() {
+    async initForm () {
       this.iniFmData();
 
       if (this.formId && this.formType != "add") {
@@ -435,11 +391,11 @@ export default {
       }
     },
 
-    computeFmData() {
+    computeFmData () {
       console.log(this.fmData);
     },
 
-    iniFmData() {
+    iniFmData () {
       const { editParams, fmData, editParamsDiv } = this;
       editParams.forEach((item, index) => {
         if (typeof item.value == "function") {
@@ -510,7 +466,7 @@ export default {
       this.iniLoaded = true;
     },
 
-    handleClickHtmlNode(e) {
+    handleClickHtmlNode (e) {
       //在判断事件目标节点的时候，考虑到兼容性应该统一转换成大写或小写进行判断
       if (e.target.localName.toLowerCase() === "a") {
         // 通过判端目标节点以后，就能在这里对其进行操作啦。
@@ -519,7 +475,7 @@ export default {
       }
     },
 
-    async getFmOptions(index, url, params, cookFn) {
+    async getFmOptions (index, url, params, cookFn) {
       const { data, code, msg } = await requestPost(url, {
         ...params,
       });
@@ -532,13 +488,13 @@ export default {
       }
     },
 
-    handleChangeCascader(vals, item) {
+    handleChangeCascader (vals, item) {
       this.fmData[item["keyName"]] = vals;
       if (typeof item.handleChangeFn == "function") {
         item.handleChangeFn(vals, item, this);
       }
     },
-    handleChangeSelect(vals, item) {
+    handleChangeSelect (vals, item) {
       console.log(vals, item);
       this.fmData[item["keyName"]] = vals;
       if (typeof item.handleChangeFn == "function") {
@@ -546,14 +502,14 @@ export default {
       }
     },
 
-    beforeImgUpload(file, item) {
+    beforeImgUpload (file, item) {
       if (typeof item.beforeImgUpload == "function") {
         if (!item.beforeImgUpload(file, item, this)) return false;
       }
       return true;
     },
 
-    handleImgRemove(file, item) {
+    handleImgRemove (file, item) {
       console.log("handleImgRemove", file);
       let url = file.response ? file.response.data.url : file.url;
       if (url) {
@@ -575,7 +531,7 @@ export default {
       }
     },
 
-    handleImgExceed(res, item) {
+    handleImgExceed (res, item) {
       console.log(res);
       // this.$message({
       //   type: "warning",
@@ -583,7 +539,7 @@ export default {
       // });
     },
 
-    handleImgSuccess(res, file, item) {
+    handleImgSuccess (res, file, item) {
       console.log("handleImgSuccess", res);
       if (res.code === 0 && res.msg === "success") {
         let { fmData } = this;
@@ -619,12 +575,12 @@ export default {
       }
     },
 
-    handleImgError(res, file, item) {
+    handleImgError (res, file, item) {
       console.log(res);
     },
 
     // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap(item) {
+    initMap (item) {
       let { latitude, longitude } = this.$store.state.user;
       if (!latitude || latitude == "" || latitude == "0") {
         latitude = 39.9088810666821;
@@ -657,7 +613,7 @@ export default {
       // this.handleMoveCenter(item);
     },
 
-    setMarker(lat, lng) {
+    setMarker (lat, lng) {
       markers.setGeometries([]);
       markers.add([
         {
@@ -671,7 +627,7 @@ export default {
       ]);
     },
 
-    handleSearchMap(item) {
+    handleSearchMap (item) {
       infoWindowList.forEach((infoWindow) => {
         infoWindow.close();
       });
@@ -703,7 +659,7 @@ export default {
         });
     },
 
-    handleMoveCenter(item, e) {
+    handleMoveCenter (item, e) {
       console.log(e);
       //修改地图中心点
       const center = map.getCenter();
@@ -724,7 +680,7 @@ export default {
       }
     },
 
-    async getInfo() {
+    async getInfo () {
       let url = this.infoUrl;
       if (!url) return;
       const { idName, formId } = this;
@@ -764,12 +720,12 @@ export default {
       }
     },
 
-    watchImg(src) {
+    watchImg (src) {
       window.open(src);
     },
 
     // 过滤文本
-    dormatHtml(content) {
+    dormatHtml (content) {
       if (
         content.startsWith(
           "<!DOCTYPE html>\n<html>\n<head>\n</head>\n<body>\n"
@@ -781,7 +737,7 @@ export default {
       return content;
     },
 
-    cookBeforeSubmit(data) {
+    cookBeforeSubmit (data) {
       Object.keys(data).forEach((k) => {
         if (typeof data[k] == "string") {
           data[k] = this.dormatHtml(data[k]);
@@ -790,7 +746,7 @@ export default {
       return data;
     },
 
-    async handleComfirm() {
+    async handleComfirm () {
       this.btnDisable = true;
       setTimeout(() => {
         this.btnDisable = false;
@@ -822,7 +778,7 @@ export default {
       });
     },
 
-    async submit() {
+    async submit () {
       const { editConfig, fmData, formType, editFixedParams } = this;
       if (
         typeof editConfig.beforeSubmit == "function" &&
@@ -862,7 +818,7 @@ export default {
       }
     },
 
-    handleCancle() {
+    handleCancle () {
       this.$emit("close");
     },
   },
diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
index 8aa71d946..31f027dc5 100644
--- a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
+++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
@@ -204,16 +204,30 @@ export default {
             },
           ],
         },
+        // {
+        //   field: "规模",
+        //   keyName: "scale",
+        //   type: "select",
+        //   optionUrl: "/sys/dict/data/dictlist",
+        //   optionUrlParams: {
+        //     dictType: "scale",
+        //   },
+        //   optionList: [],
+        //   editDisabled: false,
+        //   rules: [
+        //     {
+        //       required: true,
+        //       message: "规模不能为空",
+        //       trigger: "blur",
+        //     },
+        //   ],
+        // },
         {
           field: "规模",
-          keyName: "scale",
-          type: "select",
-          optionUrl: "/sys/dict/data/dictlist",
-          optionUrlParams: {
-            dictType: "scale",
-          },
-          optionList: [],
-          editDisabled: false,
+          keyName: "scaleTotal",
+          type: "input",
+          attach: '人',
+
           rules: [
             {
               required: true,