Merge branch 'master' of https://gitee.com/beiwu/cmanager

src/views/manage/station/mainList.vue

@@ -1,63 +1,36 @@
 <template>
   <basic-container>
-    <avue-crud
+    <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
-      :option="option"
+      :permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose" :page.sync="page"
-      :table-loading="loading"
+      @row-update="rowUpdate" @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset"
-      :data="data"
+      @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
-      ref="crud"
+      <!--      <template slot="menu" slot-scope="{row}">-->
-      v-model="form"
+      <!--        <el-button-->
-      :permission="permissionList"
+      <!--          v-if="vaildData(permission.manage_station_mainList_stop, false) && row.status !== 9"-->
-      :before-open="beforeOpen"
+      <!--          size="small"-->
-      :before-close="beforeClose"
+      <!--          icon="el-icon-delete"-->
-      :page.sync="page"
+      <!--          @click.stop="stop(row)"-->
-      @row-update="rowUpdate"
+      <!--          type="text"-->
-      @row-save="rowSave"
+      <!--        >终止合作</el-button>-->
-      @search-change="searchChange"
+      <!--      </template>-->
-      @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"-->
-<!--          size="small"-->
-<!--          icon="el-icon-delete"-->
-<!--          @click.stop="stop(row)"-->
-<!--          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
+        <el-image style="width: 100px; height: 100px" :src="form.authUrlId"
-          style="width: 100px; height: 100px"
+          :preview-src-list="[form.authUrlId]"></el-image>
-          :src="form.authUrlId"
-          :preview-src-list="[form.authUrlId]"
-        ></el-image>
       </template>
       <template slot="authUrlIdImgForm">
-        <el-image
+        <el-image style="width: 100px; height: 100px" :src="form.authUrlId"
-          style="width: 100px; height: 100px"
+          :preview-src-list="[form.authUrlId]"></el-image>
-          :src="form.authUrlId"
-          :preview-src-list="[form.authUrlId]"
-        ></el-image>
       </template>
       <template slot="identityUrl4IdImgForm">
-        <el-image
+        <el-image style="width: 100px; height: 100px" :src="form.identityUrl4Id"
-          style="width: 100px; height: 100px"
+          :preview-src-list="[form.identityUrl4Id]"></el-image>
-          :src="form.identityUrl4Id"
-          :preview-src-list="[form.identityUrl4Id]"
-        ></el-image>
       </template>
       <template slot="identityUrl5IdImgForm">
-        <el-image
+        <el-image style="width: 100px; height: 100px" :src="form.identityUrl5Id"
-          style="width: 100px; height: 100px"
+          :preview-src-list="[form.identityUrl5Id]"></el-image>
-          :src="form.identityUrl5Id"
-          :preview-src-list="[form.identityUrl5Id]"
-        ></el-image>
       </template>
     </avue-crud>
   </basic-container>
@@ -283,7 +256,7 @@ export default {
                 prop: "telphone",
                 rules: [
                   {
-                    required:true,
+                    required: true,
                     validator: (rule, value, callback) => {
                       if (validatenull(value)) {
                         callback(new Error("请输入手机号码"));
@@ -419,12 +392,14 @@ export default {
       row.authUrlId = getPath(row.authUrlId)
       row.identityUrl4Id = getPath(row.identityUrl4Id)
       row.identityUrl5Id = getPath(row.identityUrl5Id)
+      // console.log(row, '----------------------------------');
       companyInfoAdd({
         authUrlId: row.authUrlId,
         cityId: row.cityId,
         companyAddress: row.companyAddress,
         companyName: row.companyName,
         companyTid: row.companyTid,
+        comname: row.comname,
         identityUrl4Id: row.identityUrl4Id,
         identityUrl5Id: row.identityUrl5Id,
         manager: row.manager,
@@ -449,7 +424,7 @@ export default {
       );
     },
     rowUpdate(row, index, done, loading) {
-      console.log('rowUpdate')
+      // console.log(row, 'rowUpdate')
       row.authUrlId = getPath(row.authUrlId)
       row.identityUrl4Id = getPath(row.identityUrl4Id)
       row.identityUrl5Id = getPath(row.identityUrl5Id)
@@ -460,6 +435,7 @@ export default {
         companyAddress: row.companyAddress,
         companyName: row.companyName,
         companyTid: row.companyTid,
+        comname: row.comname,
         identityUrl4Id: row.identityUrl4Id,
         identityUrl5Id: row.identityUrl5Id,
         manager: row.manager,
@@ -575,5 +551,4 @@ export default {
 };
 </script>
 
-<style>
+<style></style>
-</style>