flat: 修改cityId备份

src/common/dic.js

@@ -380,3 +380,14 @@ export  const companyEnum = [
   {value: 10, label: "非盈利社会组织"},
   {value: 11, label: "其它"},
 ]
+
+export const addressColumn = [
+  {value: '95', label: "绵竹市"},
+  {value: '185', label: "广汉市"},
+  {value: '143', label: "旌阳区"},
+  {value: '150', label: "罗江区"},
+  {value: '42', label: "什邡市"},
+  {value: '156', label: "中江县"},
+  {value: '44139628', label: "经济技术开发区"},
+  {value: '79194151', label: "德阳市开发区"},
+]

src/views/manage/station/mainList.vue

@@ -2,8 +2,10 @@
   <basic-container>
     <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
                :permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose" :page.sync="page"
-      @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
+               @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel" @search-change="searchChange"
-      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
+               @search-reset="searchReset"
+               @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange"
+               @on-load="onLoad">
       <!--      <template slot="menu" slot-scope="{row}">-->
       <!--        <el-button-->
       <!--          v-if="vaildData(permission.manage_station_mainList_stop, false) && row.status !== 9"-->
@@ -13,9 +15,6 @@
       <!--          type="text"-->
       <!--        >终止合作</el-button>-->
       <!--      </template>-->
-      <template slot="cityIdForm" slot-scope="{disabled}">
-        <jl-city-cascader :disabled="disabled" v-model="form.cityId" filterable clearable></jl-city-cascader>
-      </template>
       <template slot="authUrlIdImgForm">
         <el-image style="width: 100px; height: 100px" :src="form.authUrlId"
                   :preview-src-list="[form.authUrlId]"></el-image>
@@ -37,13 +36,21 @@
 </template>
 
 <script>
-import { companyInfoAdd, companyStationInfo, companyDetail, companyUpdate, stationStop, removeMainList } from "@/api/manage/main";
+import {
+  companyInfoAdd,
+  companyStationInfo,
+  companyDetail,
+  companyUpdate,
+  stationStop,
+  removeMainList
+} from "@/api/manage/main";
 // import { getStationDic } from "@/api/manage/station";
 import {mapGetters} from "vuex";
 import {isMobile, check18IdCardNo, validatenull} from "@/util/validate";
 import {putFile} from "@/api/resource/oss";
 import {getTradeDic} from "@/api/manage/trade";
-import {companyEnum} from "@/common/dic"
+import {addressColumn, companyEnum} from "@/common/dic"
+
 const accept = [
   "image/png",
   "image/jpeg",
@@ -189,12 +196,12 @@ export default {
                 ],
               },
               {
-                type: "input",
+                type: "select",
                 label: "所在地区",
                 prop: "cityId",
                 span: 12,
+                dicData: addressColumn,
                 display: true,
-                formslot: true,
                 rules: [
                   {
                     required: true,
@@ -459,7 +466,8 @@ export default {
           });
           this.refreshChange();
         })
-        .catch(() => { });
+        .catch(() => {
+        });
     },
     rowSave(row, done, loading) {
       console.log('rowSave')

src/views/tenant/mission/Dialog/CopyMission.vue

@@ -53,7 +53,8 @@
       <template slot-scope="{ row }" slot="wage">
         <el-input placeholder="请输入工资" type="number" v-model="obj.wage" class="input-with-select" @blur="wageBlur">
           <el-select v-model="obj.wageUnitCategory" slot="append" placeholder="请选择" @change="getMaxAndMin">
-            <el-option :label="item.label" v-for="item in wageUnitCategory" :key="item.value" :value="item.value"></el-option>
+            <el-option :label="item.label" v-for="item in wageUnitCategory" :key="item.value"
+                       :value="item.value"></el-option>
           </el-select>
         </el-input>
       </template>
@@ -100,7 +101,8 @@
           icon="el-icon-circle-close"
           @click="drawer = false"
           :loading="disabled"
-          >取消</el-button
+        >取消
+        </el-button
         >
       </template>
     </avue-form>
@@ -212,7 +214,9 @@ export default {
       }
     },
     wallMaxAndMin(val) {
-      if(!val.length) {return;}
+      if (!val.length) {
+        return;
+      }
       switch (true) {
         case this.obj.wage < Math.min(...val):
           this.obj.wage = Math.min(...val)
@@ -347,8 +351,7 @@ export default {
                   if (value) {
                     self.stimeDate = value.split(' ')[0]
                     self.endTimeFlag = false
-                  }
+                  } else {
-                  else{
                     self.endTimeFlag = true
                   }
                 },
@@ -612,7 +615,7 @@ export default {
                 dicData: this.tradeData,
                 props: {
                   label: "name",
-                  value: "id",
+                  value: "name",
                 },
                 span: 12,
               },
@@ -727,7 +730,9 @@ export default {
     wageBlur(e) {
       const value = e.target.value
       const val = this.wallMaxAndMin
-      if(!val.length) {return;}
+      if (!val.length) {
+        return;
+      }
       switch (true) {
         case this.obj.wage < Math.min(...val):
           this.obj.wage = Math.min(...val)
@@ -1152,12 +1157,15 @@ export default {
 .input-with-select {
   width: 100%;
 }
+
 .copy-form .el-input-group__append {
   background-color: #fff;
 }
+
 .input-with-select .el-input-group__append .el-input__icon {
   display: none;
 }
+
 .input-with-select .el-input-group__append input {
   width: 105px;
   padding: 0;
@@ -1168,24 +1176,30 @@ export default {
   line-height: normal;
   padding: 7px;
 }
+
 .my-autocomplete li .name {
   text-overflow: ellipsis;
   overflow: hidden;
 }
+
 .my-autocomplete li .addr {
   font-size: 12px;
   color: #b4b4b4;
 }
+
 .my-autocomplete li .highlighted .addr {
   color: #ddd;
 }
+
 .tradeId .el-autocomplete {
   width: 100%;
 }
+
 .tradeId .el-icon-plus:before {
   content: "\e6d9 添加行业类型";
   color: #606266;
 }
+
 .tradeId .el-input--small input {
   padding-right: 150px;
 }