feat：博物馆和文物模块完善

src/views/culturalRelic/components/InfoEditDialog.vue

@@ -23,11 +23,12 @@
               ></el-input>
             </el-form-item>
 
-            <el-form-item label="文物类别" :label-width="formLabelWidth">
+            <el-form-item label="文物类别"   :label-width="formLabelWidth">
               <el-select
                 v-model="dialogForm.type"
                 placeholder="请选择文物类别"
                 style="width: 100%"
+                filterable
               >
                 <el-option
                   v-for="(value, key) in dict.culturalRelicType"
@@ -43,6 +44,7 @@
                 v-model="dialogForm.level"
                 placeholder="请选择文物级别"
                 style="width: 100%"
+                filterable
               >
                 <el-option
                   v-for="(value, key) in dict.culturalRelicLevel"
@@ -54,7 +56,16 @@
               </el-select>
             </el-form-item>
             <el-form-item label="文物质地" :label-width="formLabelWidth">
-              <el-select
+               <el-cascader
+                style="width: 100%"
+                v-model="dialogForm.textureType"
+                :options="culturalRelicTextureType"
+                :props="culturalRelicTextureProps"
+                placeholder="请选择文物质地"
+                filterable
+              >
+              </el-cascader>
+              <!-- <el-select
                 v-model="dialogForm.textureType"
                 placeholder="请选择文物质地"
                 style="width: 100%"
@@ -66,7 +77,7 @@
                   :value="key"
                 >
                 </el-option>
-              </el-select>
+              </el-select> -->
             </el-form-item>
             <el-form-item label="具体尺寸" :label-width="formLabelWidth">
               <el-input
@@ -82,21 +93,10 @@
                 :options="culturalRelicYears"
                 :props="culturalRelicYearsProps"
                 placeholder="请选择文物年代"
+                filterable
               >
               </el-cascader>
-              <!-- <el-select
-                v-model="dialogForm.years"
-                placeholder="请选择文物年代"
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="(item, key) in culturalRelicYears"
-                  :key="key"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option> -->
-              <!-- </el-select> -->
+              
             </el-form-item>
             <el-form-item label="文物数量" :label-width="formLabelWidth">
               <!-- <el-input
@@ -370,7 +370,7 @@ export default {
       images: [],
       videos: [],
       audios: [],
-      culturalRelicTexture: "",
+      culturalRelicTextureType: "",
       culturalRelicYears: "",
       culturalRelicYearsProps: {
         value: "value",
@@ -378,6 +378,12 @@ export default {
         children: "children",
         checkStrictly: true, //单选选择任意一级选项
       },
+      culturalRelicTextureProps: {
+        value: "value",
+        label: "label",
+        children: "children",
+        checkStrictly: true, //单选选择任意一级选项
+      },
     };
   },
   async created() {
@@ -388,13 +394,11 @@ export default {
   mounted() {
     this.$store
       .dispatch("dict/getDictTree", [
-        "culturalRelicTexture",
+        "culturalRelicTextureType",
         "culturalRelicYears",
       ])
       .then((res) => {
-        // debugger;
-        // console.log(res);
-        this.culturalRelicTexture = res.culturalRelicTexture;
+        this.culturalRelicTextureType = res.culturalRelicTextureType;
         this.culturalRelicYears = res.culturalRelicYears;
       });
   },
@@ -505,8 +509,7 @@ export default {
           this.dialogForm[media] = "";
         }
       });
-
-      if (!that.dialogForm.exhibitionId) {
+      if (!that.dialogForm.crId) {
         const { deptId, regionCode } = this.userInfo;
         const params = { ...this.dialogForm, deptId, regionCode };
         params.literature = this.literatureValues.join(",");
@@ -514,7 +517,7 @@ export default {
         // 处理年份
         params.years = params.years[params.years.length - 1];
         // 处理质地TODO:
-        // params.texture = params.texture[params.texture.length - 1];
+        params.textureType = params.textureType[params.textureType.length - 1];
         let res = await addCulturalRelic(params);
         if (res.code == 0) {
           this.$message.success("提交成功！");
@@ -533,9 +536,9 @@ export default {
           params.years = params.years[params.years.length - 1];
         }
         // 处理质地
-        // if (params.texture instanceof Array) {
-        //   params.texture = params.texture[params.texture.length - 1];
-        // }
+        if (params.textureType instanceof Array) {
+          params.textureType = params.textureType[params.textureType.length - 1].trim();
+        }
         let res = await editCulturalRelic(params);
         if (res.code == 0) {
           this.$message.success("修改成功！");
@@ -544,44 +547,7 @@ export default {
           this.$emit("refresh");
           this.reset();
         }
-        // const {
-        //   exhibitionId,
-        //   faceImage,
-        //   faceImageUrl,
-        //   images,
-        //   audios,
-        //   videos,
-        //   regionCode,
-        //   deptId,
-        // } = this.dialogForm;
-
-        // let literature = this.literatureValues.join(",");
-        // let status = this.dialogForm.status ? 1 : 0;
-        // // return;
-        // const params = {
-        //   exhibitionId,
-        //   audios,
-        //   deptId,
-        //   faceImage,
-        //   faceImageUrl,
-        //   images,
-        //   regionCode,
-        //   videos,
-        //   status,
-        //   literature,
-        // };
-        // console.log("修改参数-----------", params);
-        // // return;
-        // let res = await editDisplay(params);
-        // if (res.code == 0) {
-        //   this.$message.success("提交成功！");
-        //   this.loading = false;
-        //   this.$emit("refresh");
-        //   this.reset();
-        // }
       }
-
-      // }
     },
 
     handleClose(done) {

src/views/museum/components/InfoEditDialog.vue

@@ -20,7 +20,7 @@
             placeholder="请输入博物馆名称"
           ></el-input>
         </el-form-item>
-        <el-form-item label="所属部门" :label-width="formLabelWidth">
+        <!-- <el-form-item label="所属部门" :label-width="formLabelWidth">
           <el-cascader
             style="width: 100%"
             v-model="dialogForm.pid"
@@ -31,7 +31,7 @@
             disabled
           >
           </el-cascader>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="所属地" :label-width="formLabelWidth">
           <el-cascader
             style="width: 100%"
@@ -82,7 +82,7 @@
             type="textarea"
             placeholder="请输入博物馆简介"
             v-model="dialogForm.intro"
-            maxlength="300"
+            maxlength="600"
             show-word-limit
           >
           </el-input>
@@ -249,10 +249,10 @@ export default {
         if (params.regionCode instanceof Array) {
           params.regionCode = params.regionCode[params.regionCode.length - 1];
         }
-        // 处理所属部门
-        if (params.pid instanceof Array) {
-          params.pid = params.pid[params.pid.length - 1];
-        }
+        // // 处理所属部门
+        // if (params.pid instanceof Array) {
+        //   params.pid = params.pid[params.pid.length - 1];
+        // }
         // 处理状态
         // debugger
         params.status = this.status ? 1 : 0;
@@ -270,7 +270,7 @@ export default {
         // 处理行政区划
         params.regionCode = params.regionCode[params.regionCode.length - 1];
         // 处理所属部门
-        params.pid = params.pid[params.pid.length - 1];
+        // params.pid = params.pid[params.pid.length - 1];
         // 处理状态
         params.status = this.status ? 1 : 0;
         // return

src/views/museum/index.vue

@@ -12,7 +12,7 @@
       :tree-props="{ children: 'children' }"
       fit
       row-key="id"
-      :data="orgTreeData"
+      :data="tabelData"
       border
       stripe
       default-expand-all
@@ -37,11 +37,22 @@
           </el-popconfirm>
         </template>
       </el-table-column> -->
-      <el-table-column align="center" prop="longitude" label="经度">
+      <el-table-column align="center" label="封面">
+        <template slot-scope="scope">
+          <img :src="scope.row.faceImageUrl" width="100%" height="150px"/>
+        </template>
       </el-table-column>
-      <el-table-column align="center" prop="latitude" label="纬度">
+      <!-- <el-table-column align="center" prop="longitude" label="经度">
       </el-table-column>
-      <el-table-column align="center" prop="intro" label="简介" />
+      <el-table-column align="center" prop="latitude" label="纬度">
+      </el-table-column> -->
+      <el-table-column
+        align="center"
+        prop="intro"
+        label="简介"
+        show-overflow-tooltip
+      />
+
       <el-table-column align="center" label="操作">
         <template slot-scope="scope">
           <el-button
@@ -127,6 +138,7 @@ export default {
       loading: false,
       orgTreeData: [],
       expandRow: [],
+      tabelData:[]
     };
   },
   watch: {
@@ -219,10 +231,9 @@ export default {
      * @param  isReload {Boolean} 是否需要重新调用接口加载，默认不传则从vuex中获取
      */
     loadData(isReload) {
-      // debugger
-      console.log("收到isReload", isReload);
       this.$store.dispatch("org/getMuseumTreeData", isReload).then((res) => {
         this.orgTreeData = res;
+        this.tabelData = res[0].children
       });
     },
 
@@ -243,7 +254,7 @@ export default {
           let res = await deleteMuseum(id);
           if (res.code == 0) {
             this.$message.success("删除成功！");
-           this.loadData(true);
+            this.loadData(true);
           }
           break;
       }
@@ -276,7 +287,7 @@ export default {
     // 改变当前显示页
     handleCurrentChange(value) {
       this.list.current = value;
-     this.loadData(true);
+      this.loadData(true);
     },
 
     // 搜索