Merge remote-tracking branch 'origin/main'

ruoyi-ui/src/views/szxc/sbzl/index.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="上报单位" prop="deptId">
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" :disable-branch-nodes="true" style="width:215px;"
+                    placeholder="请选择上报单位"/>
+      </el-form-item>
       <el-form-item label="上报人" prop="subName">
         <el-input
           v-model="queryParams.subName"
@@ -25,30 +29,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
+
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="上报单位" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入上报单位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建者ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建者ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -101,21 +82,23 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="sbzlList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="上报人" align="center" prop="subName" />
       <el-table-column label="上报日期" align="center" prop="subDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.subDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="上报分类" align="center" prop="subType" />
+      <el-table-column label="上报分类" align="center" prop="subType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_sb_type" :value="scope.row.subType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="上报标题" align="center" prop="title" />
       <el-table-column label="内容" align="center" prop="content" />
-      <el-table-column label="部门id" align="center" prop="deptId" />
       <el-table-column label="上报单位" align="center" prop="deptName" />
-      <el-table-column label="创建者ID" align="center" prop="userId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -135,7 +118,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -147,32 +130,42 @@
     <!-- 添加或修改上报资料对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="上报单位" prop="deptId">
+          <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true"
+                      placeholder="请选择上报单位" style="width:100%;" @select="selectedTree"/>
+        </el-form-item>
+        <el-form-item label="上报标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入上报标题" />
+        </el-form-item>
         <el-form-item label="上报人" prop="subName">
           <el-input v-model="form.subName" placeholder="请输入上报人" />
         </el-form-item>
+        <el-form-item label="上报分类" prop="subType">
+          <el-select
+            v-model="form.subType"
+            placeholder="上报分类"
+            clearable
+            style="width:100%"
+          >
+            <el-option
+              v-for="dict in dict.type.szxc_sb_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="上报日期" prop="subDate">
-          <el-date-picker clearable
+          <el-date-picker clearable style="width: 100%"
             v-model="form.subDate"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="请选择上报日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="上报标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入上报标题" />
-        </el-form-item>
         <el-form-item label="内容">
           <editor v-model="form.content" :min-height="192"/>
         </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="上报单位" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入上报单位" />
-        </el-form-item>
-        <el-form-item label="创建者ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -184,9 +177,14 @@
 
 <script>
 import { listSbzl, getSbzl, delSbzl, addSbzl, updateSbzl } from "@/api/szxc/sbzl";
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Sbzl",
+  components: { Treeselect },
+  dicts: ['szxc_sb_type'],
   data() {
     return {
       // 遮罩层
@@ -202,7 +200,9 @@ export default {
       // 总条数
       total: 0,
       // 上报资料表格数据
-      sbzlList: [],
+      list: [],
+      // 组织树选项
+      deptOptions: undefined,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -238,13 +238,24 @@ export default {
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
+    /** 查询组织下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    selectedTree(node){
+      this.form.deptId = node.id;
+      this.form.deptName = node.label;
+    },
     /** 查询上报资料列表 */
     getList() {
       this.loading = true;
       listSbzl(this.queryParams).then(response => {
-        this.sbzlList = response.rows;
+        this.list = response.rows;
         this.total = response.total;
         this.loading = false;
       });

ruoyi-ui/src/views/szxc/workrecard/index.vue

@@ -1,6 +1,18 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+      <el-form-item label="所属网格" prop="deptId">
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" :disable-branch-nodes="true" style="width:215px;"
+                    placeholder="请选择所属网格"/>
+      </el-form-item>
+      <el-form-item label="标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="工作人员" prop="workerName">
         <el-input
           v-model="queryParams.workerName"
@@ -33,54 +45,6 @@
           placeholder="请选择结束时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="标题" prop="title">
-        <el-input
-          v-model="queryParams.title"
-          placeholder="请输入标题"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="图片" prop="picture">
-        <el-input
-          v-model="queryParams.picture"
-          placeholder="请输入图片"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="审核备注" prop="shRemark">
-        <el-input
-          v-model="queryParams.shRemark"
-          placeholder="请输入审核备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属网格" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入所属网格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建者ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建者ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -133,34 +97,44 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="workrecardList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="工作人员" align="center" prop="workerName" />
-      <el-table-column label="提报日期" align="center" prop="submitDate" width="180">
+      <el-table-column label="提报日期" align="center" prop="submitDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="开始时间" align="center" prop="startDate" width="180">
+      <el-table-column label="开始时间" align="center" prop="startDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="结束时间" align="center" prop="endDate" width="180">
+      <el-table-column label="结束时间" align="center" prop="endDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="类别" align="center" prop="type" />
+      <el-table-column label="类别" align="center" prop="type" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_gzjl_type" :value="scope.row.type"/>
+        </template>
+      </el-table-column>
       <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="图片" align="center" prop="picture" />
+      <el-table-column label="图片" align="center" prop="picture" >
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.picture" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
       <el-table-column label="内容" align="center" prop="content" />
-      <el-table-column label="审核状态" align="center" prop="gzStatus" />
+      <el-table-column label="审核状态" align="center" prop="gzStatus" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.gzStatus"/>
+        </template>
+      </el-table-column>
       <el-table-column label="审核备注" align="center" prop="shRemark" />
-      <el-table-column label="部门id" align="center" prop="deptId" />
       <el-table-column label="所属网格" align="center" prop="deptName" />
-      <el-table-column label="创建者ID" align="center" prop="userId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -180,7 +154,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -190,70 +164,121 @@
     />
 
     <!-- 添加或修改工作记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="工作人员" prop="workerName">
+        <el-row :gutter="10">
-          <el-input v-model="form.workerName" placeholder="请输入工作人员" />
+          <el-col :span="8">
-        </el-form-item>
+            <el-form-item label="标题" prop="title">
-        <el-form-item label="提报日期" prop="submitDate">
+              <el-input v-model="form.title" placeholder="请输入标题" />
-          <el-date-picker clearable
+            </el-form-item>
-            v-model="form.submitDate"
+          </el-col>
-            type="date"
+          <el-col :span="8">
-            value-format="yyyy-MM-dd"
+            <el-form-item label="所属网格" prop="deptId">
-            placeholder="请选择提报日期">
+              <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true"
-          </el-date-picker>
+                          placeholder="请选择所属网格" style="width:100%;" @select="selectedTree"/>
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="开始时间" prop="startDate">
+          </el-col>
-          <el-date-picker clearable
+          <el-col :span="8">
-            v-model="form.startDate"
+            <el-form-item label="工作人员" prop="workerName">
-            type="date"
+              <el-input v-model="form.workerName" placeholder="请输入工作人员" />
-            value-format="yyyy-MM-dd"
+            </el-form-item>
-            placeholder="请选择开始时间">
+          </el-col>
-          </el-date-picker>
+        </el-row>
-        </el-form-item>
+
-        <el-form-item label="结束时间" prop="endDate">
+        <el-row :gutter="10">
-          <el-date-picker clearable
+
-            v-model="form.endDate"
+          <el-col :span="8">
-            type="date"
+            <el-form-item label="提报日期" prop="submitDate">
-            value-format="yyyy-MM-dd"
+              <el-date-picker clearable style="width: 100%"
-            placeholder="请选择结束时间">
+                              v-model="form.submitDate"
-          </el-date-picker>
+                              type="date"
-        </el-form-item>
+                              value-format="yyyy-MM-dd"
-        <el-form-item label="标题" prop="title">
+                              placeholder="请选择提报日期">
-          <el-input v-model="form.title" placeholder="请输入标题" />
+              </el-date-picker>
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="图片" prop="picture">
+          </el-col>
-          <el-input v-model="form.picture" placeholder="请输入图片" />
+          <el-col :span="8">
-        </el-form-item>
+            <el-form-item label="开始时间" prop="startDate">
-        <el-form-item label="内容">
+              <el-date-picker clearable style="width: 100%"
-          <editor v-model="form.content" :min-height="192"/>
+                              v-model="form.startDate"
-        </el-form-item>
+                              type="date"
-        <el-form-item label="审核备注" prop="shRemark">
+                              value-format="yyyy-MM-dd"
-          <el-input v-model="form.shRemark" placeholder="请输入审核备注" />
+                              placeholder="请选择开始时间">
-        </el-form-item>
+              </el-date-picker>
-        <el-form-item label="部门id" prop="deptId">
+            </el-form-item>
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
+          </el-col>
-        </el-form-item>
+          <el-col :span="8">
-        <el-form-item label="所属网格" prop="deptName">
+            <el-form-item label="结束时间" prop="endDate">
-          <el-input v-model="form.deptName" placeholder="请输入所属网格" />
+              <el-date-picker clearable style="width: 100%"
-        </el-form-item>
+                              v-model="form.endDate"
-        <el-form-item label="创建者ID" prop="userId">
+                              type="date"
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
+                              value-format="yyyy-MM-dd"
-        </el-form-item>
+                              placeholder="请选择结束时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="8">
+            <el-form-item label="类别" prop="type">
+              <el-select
+                         v-model="form.type"
+                         placeholder="类别"
+                         clearable
+                         style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_gzjl_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="16">
+            <el-form-item label="图片" prop="picture">
+              <image-upload v-model="form.picture"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="内容">
+              <editor v-model="form.content" :min-height="150"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="审核备注" prop="shRemark">
+              <el-input v-model="form.shRemark" type="textarea" :rows="10" placeholder="请输入审核备注" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
       </el-form>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
+
     </el-dialog>
   </div>
 </template>
 
 <script>
 import { listWorkrecard, getWorkrecard, delWorkrecard, addWorkrecard, updateWorkrecard } from "@/api/szxc/workrecard";
+import { deptTreeSelect } from "@/api/system/user";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Workrecard",
+  components: { Treeselect },
+  dicts: ['szxc_gzjl_type', 'szxc_audit_status'],
   data() {
     return {
       // 遮罩层
@@ -269,7 +294,9 @@ export default {
       // 总条数
       total: 0,
       // 工作记录表格数据
-      workrecardList: [],
+      list: [],
+      // 组织树选项
+      deptOptions: undefined,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -310,13 +337,24 @@ export default {
   },
   created() {
     this.getList();
+    this.getDeptTree();
   },
   methods: {
+    /** 查询组织下拉树结构 */
+    getDeptTree() {
+      deptTreeSelect().then(response => {
+        this.deptOptions = response.data;
+      });
+    },
+    selectedTree(node){
+      this.form.deptId = node.id;
+      this.form.deptName = node.label;
+    },
     /** 查询工作记录列表 */
     getList() {
       this.loading = true;
       listWorkrecard(this.queryParams).then(response => {
-        this.workrecardList = response.rows;
+        this.list = response.rows;
         this.total = response.total;
         this.loading = false;
       });
@@ -393,6 +431,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.gzStatus = '0'
             addWorkrecard(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

ruoyi-ui/src/views/szxc/zcss/index.vue

@@ -1,6 +1,10 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="所属网格" prop="deptId">
+        <treeselect v-model="queryParams.deptId" :options="deptOptions" :disable-branch-nodes="true" style="width:215px;"
+                    placeholder="请选择所属网格"/>
+      </el-form-item>
       <el-form-item label="资产名称" prop="zcName">
         <el-input
           v-model="queryParams.zcName"
@@ -9,6 +13,21 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="资产类型" prop="zcType">
+        <el-select
+          v-model="queryParams.zcType"
+          placeholder="请选择资产类型"
+          clearable
+          style="width:100%"
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_zc_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="安装时间" prop="installDate">
         <el-date-picker clearable
                         v-model="queryParams.installDate"
@@ -41,21 +60,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="资产照片" prop="picture">
-        <el-input
-          v-model="queryParams.picture"
-          placeholder="请输入资产照片"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="是否定期巡检" prop="xj">
-        <el-input
+        <el-select
           v-model="queryParams.xj"
-          placeholder="请输入是否定期巡检"
+          placeholder="请选择是否定期巡检"
           clearable
-          @keyup.enter.native="handleQuery"
+          style="width:100%"
-        />
+        >
+          <el-option
+            v-for="dict in dict.type.szxc_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="巡检周期(天)" prop="xjCycle">
         <el-input
@@ -65,7 +83,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="上次巡检时间" prop="lastTime">
+<!--      <el-form-item label="上次巡检时间" prop="lastTime">
         <el-date-picker clearable
                         v-model="queryParams.lastTime"
                         type="date"
@@ -88,31 +106,7 @@
                         value-format="yyyy-MM-dd"
                         placeholder="请选择巡检结束日期">
         </el-date-picker>
-      </el-form-item>
+      </el-form-item>-->
-      <el-form-item label="部门id" prop="deptId">
-        <el-input
-          v-model="queryParams.deptId"
-          placeholder="请输入部门id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="所属网格" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入所属网格"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建者ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入创建者ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -165,12 +159,17 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="zcssList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" />
+      <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="所属网格" align="center" prop="deptName" />
       <el-table-column label="资产名称" align="center" prop="zcName" />
-      <el-table-column label="资产类型(字典)" align="center" prop="zcType" />
+      <el-table-column label="资产类型" align="center" prop="zcType" >
-      <el-table-column label="安装时间" align="center" prop="installDate" width="180">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_zc_type" :value="scope.row.zcType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="安装时间" align="center" prop="installDate">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.installDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -178,28 +177,33 @@
       <el-table-column label="负责人" align="center" prop="fzr" />
       <el-table-column label="联系电话" align="center" prop="phone" />
       <el-table-column label="详细地址" align="center" prop="address" />
-      <el-table-column label="资产照片" align="center" prop="picture" />
+      <el-table-column label="资产照片" align="center" prop="picture" >
-      <el-table-column label="是否定期巡检" align="center" prop="xj" />
+        <template slot-scope="scope">
+          <image-preview :src="scope.row.picture" :width="50" :height="50"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="是否定期巡检" align="center" prop="xj" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.szxc_yes_no" :value="scope.row.xj"/>
+        </template>
+      </el-table-column>
       <el-table-column label="巡检周期(天)" align="center" prop="xjCycle" />
-      <el-table-column label="上次巡检时间" align="center" prop="lastTime" width="180">
+      <el-table-column label="上次巡检时间" align="center" prop="lastTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.lastTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="巡检开始日期" align="center" prop="xjStart" width="180">
+      <el-table-column label="巡检开始日期" align="center" prop="xjStart">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.xjStart, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="巡检结束日期" align="center" prop="xjEnd" width="180">
+      <el-table-column label="巡检结束日期" align="center" prop="xjEnd">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.xjEnd, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="部门id" align="center" prop="deptId" />
-      <el-table-column label="所属网格" align="center" prop="deptName" />
-      <el-table-column label="创建者ID" align="center" prop="userId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -229,73 +233,132 @@
     />
 
     <!-- 添加或修改资产设施对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="资产名称" prop="zcName">
+        <el-row :gutter="10">
-          <el-input v-model="form.zcName" placeholder="请输入资产名称" />
+          <el-col :span="12">
-        </el-form-item>
+            <el-form-item label="所属网格" prop="deptId">
-        <el-form-item label="安装时间" prop="installDate">
+              <treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true"
-          <el-date-picker clearable
+                          placeholder="请选择所属网格" style="width:100%;" @select="selectedTree"/>
-                          v-model="form.installDate"
+            </el-form-item>
-                          type="date"
+          </el-col>
-                          value-format="yyyy-MM-dd"
+          <el-col :span="12">
-                          placeholder="请选择安装时间">
+            <el-form-item label="资产名称" prop="zcName">
-          </el-date-picker>
+              <el-input v-model="form.zcName" placeholder="请输入资产名称" />
-        </el-form-item>
+            </el-form-item>
-        <el-form-item label="负责人" prop="fzr">
+          </el-col>
-          <el-input v-model="form.fzr" placeholder="请输入负责人" />
+        </el-row>
-        </el-form-item>
+
-        <el-form-item label="联系电话" prop="phone">
+        <el-row :gutter="10">
-          <el-input v-model="form.phone" placeholder="请输入联系电话" />
+          <el-col :span="12">
-        </el-form-item>
+            <el-form-item label="资产类型" prop="zcType">
-        <el-form-item label="详细地址" prop="address">
+              <el-select
-          <el-input v-model="form.address" placeholder="请输入详细地址" />
+                v-model="form.zcType"
-        </el-form-item>
+                placeholder="请选择资产类型"
+                clearable
+                style="width:100%"
+              >
+                <el-option
+                  v-for="dict in dict.type.szxc_zc_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="安装时间" prop="installDate">
+              <el-date-picker clearable
+                              v-model="form.installDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择安装时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="fzr">
+              <el-input v-model="form.fzr" placeholder="请输入负责人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入联系电话" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="详细地址" prop="address">
+              <el-input v-model="form.address" placeholder="请输入详细地址" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否定期巡检" prop="xj">
+              <el-radio-group v-model="form.xj">
+                <el-radio
+                  v-for="dict in dict.type.szxc_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="上次巡检时间" prop="lastTime">
+              <el-date-picker clearable
+                              v-model="form.lastTime"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择上次巡检时间">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="巡检周期(天)" prop="xjCycle">
+              <el-input v-model="form.xjCycle" placeholder="请输入巡检周期(天)" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="10">
+          <el-col :span="12">
+            <el-form-item label="巡检开始日期" prop="xjStart">
+              <el-date-picker clearable
+                              v-model="form.xjStart"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="请选择巡检开始日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="巡检结束日期" prop="xjEnd">
+            <el-date-picker clearable
+                            v-model="form.xjEnd"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="请选择巡检结束日期">
+            </el-date-picker>
+          </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-form-item label="资产照片" prop="picture">
-          <el-input v-model="form.picture" placeholder="请输入资产照片" />
+          <image-upload v-model="form.picture"/>
-        </el-form-item>
-        <el-form-item label="是否定期巡检" prop="xj">
-          <el-input v-model="form.xj" placeholder="请输入是否定期巡检" />
-        </el-form-item>
-        <el-form-item label="巡检周期(天)" prop="xjCycle">
-          <el-input v-model="form.xjCycle" placeholder="请输入巡检周期(天)" />
-        </el-form-item>
-        <el-form-item label="上次巡检时间" prop="lastTime">
-          <el-date-picker clearable
-                          v-model="form.lastTime"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择上次巡检时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="巡检开始日期" prop="xjStart">
-          <el-date-picker clearable
-                          v-model="form.xjStart"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择巡检开始日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="巡检结束日期" prop="xjEnd">
-          <el-date-picker clearable
-                          v-model="form.xjEnd"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择巡检结束日期">
-          </el-date-picker>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="部门id" prop="deptId">
-          <el-input v-model="form.deptId" placeholder="请输入部门id" />
-        </el-form-item>
-        <el-form-item label="所属网格" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入所属网格" />
-        </el-form-item>
-        <el-form-item label="创建者ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入创建者ID" />
         </el-form-item>
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -307,9 +370,14 @@
 
 <script>
   import { listZcss, getZcss, delZcss, addZcss, updateZcss } from "@/api/szxc/zcss";
+  import { deptTreeSelect } from "@/api/system/user";
+  import Treeselect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
   export default {
     name: "Zcss",
+    components: { Treeselect },
+    dicts: ['szxc_yes_no', 'szxc_zc_type'],
     data() {
       return {
         // 遮罩层
@@ -325,7 +393,9 @@
         // 总条数
         total: 0,
         // 资产设施表格数据
-        zcssList: [],
+        list: [],
+        // 组织树选项
+        deptOptions: undefined,
         // 弹出层标题
         title: "",
         // 是否显示弹出层
@@ -359,13 +429,24 @@
     },
     created() {
       this.getList();
+      this.getDeptTree();
     },
     methods: {
+      /** 查询组织下拉树结构 */
+      getDeptTree() {
+        deptTreeSelect().then(response => {
+          this.deptOptions = response.data;
+        });
+      },
+      selectedTree(node){
+        this.form.deptId = node.id;
+        this.form.deptName = node.label;
+      },
       /** 查询资产设施列表 */
       getList() {
         this.loading = true;
         listZcss(this.queryParams).then(response => {
-          this.zcssList = response.rows;
+          this.list = response.rows;
           this.total = response.total;
           this.loading = false;
         });