露天矿删 尾矿库 添加所属公司

src/api/kd/mine.js

@@ -64,7 +64,7 @@ export default {
   // 修改露天矿山
   setOpencast: (mine) => {
     mine.hasEnable = null
-    mine.enterpriseId = null
+    // mine.enterpriseId = null
     mine.createDatetime = null
     mine.createBy = null
     mine.updateDatetime = null
@@ -78,7 +78,7 @@ export default {
   // 修改尾矿库
   setTailings: (mine) => {
     mine.hasEnable = null
-    mine.enterpriseId = null
+    // mine.enterpriseId = null
     mine.createDatetime = null
     mine.createBy = null
     mine.updateDatetime = null

src/views/kd/e/mine/opencast.vue

@@ -5,6 +5,7 @@
       <div>
         <el-input v-model="searchParam.code" clearable size="small" placeholder="矿山编号" style="width: 200px;" class="filter-item" />
         <el-input v-model="searchParam.nameLike" clearable size="small" placeholder="矿山名称" style="width: 200px;" class="filter-item" />
+        <el-input v-model="searchParam.enterpriseName" clearable size="small" placeholder="所属企业" style="width: 200px;" class="filter-item" />
         <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="searchSubmit">搜索</el-button>
         <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="searchParamReset">重置</el-button>
       </div>
@@ -30,9 +31,20 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="所属行政区划：" prop="_administrativeAreaCascade">
+            <!-- <el-form-item label="所属行政区划：" prop="_administrativeAreaCascade">
               <span v-show="!editing">{{ dialog1Data.administrativeAreaName }}</span>
               <el-cascader v-show="editing" v-model="dialog1Data._administrativeAreaCascade" style="width: 100%;" :options="administrativeAreaList" clearable />
+            </el-form-item> -->
+            <el-form-item label="所属企业：" prop="enterpriseId">
+              <span v-show="!editing">{{ dialog1Data.enterpriseName }}</span>
+              <el-select v-show="editing" size="mini" v-model="dialog1Data.enterpriseId" placeholder="" @change="handleChange">
+                <el-option
+                  v-for="item in companyList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -433,6 +445,7 @@
       <!-- <el-table-column type="selection" width="55" /> -->
       <el-table-column :show-overflow-tooltip="true" label="编号" prop="id" width="100px" align="center" />
       <el-table-column :show-overflow-tooltip="true" label="矿山名称" prop="name" align="center" />
+      <el-table-column :show-overflow-tooltip="true" label="所属企业" prop="enterpriseName" align="center" />
       <el-table-column :show-overflow-tooltip="true" label="矿山编号" prop="code" align="center" />
       <el-table-column :show-overflow-tooltip="true" label="矿山地址" prop="address" align="center" />
       <el-table-column :show-overflow-tooltip="true" label="建矿时间" prop="buildDate" align="center" />
@@ -467,6 +480,7 @@
 </template>
 
 <script>
+import {getCompanyList} from '@/api/system/user'        
 import mineApi from '@/api/kd/mine'
 import mineStopApplyApi from '@/api/kd/mineStopApply'
 import dictionaryApi from '@/api/kd/dictionary'
@@ -478,7 +492,8 @@ import { validatePhone } from '@/utils/validate'
 const searchParam = {// 默认搜索条件
   page: 1,
   count: 10,
-  searchCount: true
+  searchCount: true,
+  enterpriseName: ''
 }
 export default {
   name: 'EOpencast', // 本页面名
@@ -488,6 +503,7 @@ export default {
       httpHeaders: {
         'Authorization': getToken()
       },
+      companyList: [],
       administrativeAreaList: [],
       dict12List: [],
       dict13List: [],
@@ -514,7 +530,8 @@ export default {
         liablePersonPhone: [{ required: false, trigger: 'blur', validator: validatePhone }],
         managedPersonPhone: [{ required: false, trigger: 'blur', validator: validatePhone }],
         safetyPersonPhone: [{ required: false, trigger: 'blur', validator: validatePhone }],
-        runState: [{ required: true, message: '请选择' }]
+        runState: [{ required: true, message: '请选择' }],
+        enterpriseId: [{ required: true, message: '请选择' }]
       },
       editState: 0, // （刚打开窗口时）记录了上次窗口作用；（保存编辑时）记录了当前窗口作用； 0无 1新增 2修改 3查看
       addingData: {}, // 上次正在新增时的内容，下次打开dialog1窗口时记录下来
@@ -539,6 +556,7 @@ export default {
     }
   },
   mounted() {
+   
     administrativeAreaApi.cascadeElementUI().then(response => {
       this.administrativeAreaList = response.results
     })
@@ -550,8 +568,15 @@ export default {
     })
     this.searchParamReset()
     this.searchSubmit()
+    this.getCompanyList()
   },
   methods: {
+    getCompanyList(){
+      getCompanyList({})
+      .then((res) => {
+        this.companyList = res.body;
+      });
+    },
     searchParamReset() {
       this.searchParam = JSON.parse(JSON.stringify(searchParam))
     },

src/views/kd/e/mine/tailings.vue

@@ -5,6 +5,7 @@
       <div>
         <el-input v-model="searchParam.code" clearable size="small" placeholder="尾矿库编号" style="width: 200px;" class="filter-item" />
         <el-input v-model="searchParam.nameLike" clearable size="small" placeholder="尾矿库名称" style="width: 200px;" class="filter-item" />
+        <el-input v-model="searchParam.enterpriseName" clearable size="small" placeholder="所属企业" style="width: 200px;" class="filter-item" />
         <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="searchSubmit">搜索</el-button>
         <el-button class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="searchParamReset">重置</el-button>
       </div>
@@ -30,9 +31,20 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="所属行政区划：" prop="_administrativeAreaCascade">
+            <!-- <el-form-item label="所属行政区划：" prop="_administrativeAreaCascade">
               <span v-show="!editing">{{ dialog1Data.administrativeAreaName }}</span>
               <el-cascader v-show="editing" v-model="dialog1Data._administrativeAreaCascade" style="width: 100%;" :options="administrativeAreaList" clearable />
+            </el-form-item> -->
+            <el-form-item label="所属企业：" prop="enterpriseId">
+              <span v-show="!editing">{{ dialog1Data.enterpriseName }}</span>
+              <el-select v-show="editing" size="mini" v-model="dialog1Data.enterpriseId" placeholder="" @change="handleChange">
+                <el-option
+                  v-for="item in companyList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -567,6 +579,7 @@
       <!-- <el-table-column type="selection" width="55" /> -->
       <el-table-column :show-overflow-tooltip="true" label="编号" prop="id" width="100px" align="center" />
       <el-table-column :show-overflow-tooltip="true" label="尾矿库名称" prop="name" align="center" />
+      <el-table-column :show-overflow-tooltip="true" label="所属企业" prop="enterpriseName" align="center" />
       <el-table-column :show-overflow-tooltip="true" label="尾矿库编号" prop="code" align="center" />
       <el-table-column :show-overflow-tooltip="true" label="尾矿库地址" prop="address" align="center" />
       <el-table-column :show-overflow-tooltip="true" label="尾矿库等级" prop="dict19Name" align="center" />
@@ -601,6 +614,7 @@
 </template>
 
 <script>
+import {getCompanyList} from '@/api/system/user'
 import mineApi from '@/api/kd/mine'
 import mineStopApplyApi from '@/api/kd/mineStopApply'
 import dictionaryApi from '@/api/kd/dictionary'
@@ -612,13 +626,15 @@ import { validatePhone } from '@/utils/validate'
 const searchParam = {// 默认搜索条件
   page: 1,
   count: 10,
-  searchCount: true
+  searchCount: true,
+  enterpriseName: ''
 }
 export default {
   name: 'ETailings', // 本页面名
   components: { AMapSearchPoint },
   data() {
     return {
+      companyList: [],
       httpHeaders: {
         'Authorization': getToken()
       },
@@ -658,7 +674,8 @@ export default {
         liablePersonPhone: [{ required: true, trigger: 'blur', validator: validatePhone }],
         safetyPersonPhone: [{ required: true, trigger: 'blur', validator: validatePhone }],
         dutyPhone: [{ required: true, trigger: 'blur', validator: validatePhone }],
-        runState: [{ required: true, message: '请选择' }]
+        runState: [{ required: true, message: '请选择' }],
+        enterpriseId: [{ required: true, message: '请选择' }]
       },
       editState: 0, // （刚打开窗口时）记录了上次窗口作用；（保存编辑时）记录了当前窗口作用； 0无 1新增 2修改 3查看
       addingData: {}, // 上次正在新增时的内容，下次打开dialog1窗口时记录下来
@@ -694,8 +711,15 @@ export default {
     })
     this.searchParamReset()
     this.searchSubmit()
+    this.getCompanyList()
   },
   methods: {
+    getCompanyList(){
+      getCompanyList({})
+      .then((res) => {
+        this.companyList = res.body;
+      });
+    },
     searchParamReset() {
       this.searchParam = JSON.parse(JSON.stringify(searchParam))
     },

src/views/kd/e/mine/underground.vue

@@ -484,7 +484,8 @@ export default {
         liablePersonPhone: [{ required: false, trigger: 'blur', validator: validatePhone }],
         managedPersonPhone: [{ required: false, trigger: 'blur', validator: validatePhone }],
         safetyPersonPhone: [{ required: false, trigger: 'blur', validator: validatePhone }],
-        runState: [{ required: true, message: '请选择' }]
+        runState: [{ required: true, message: '请选择' }],
+        enterpriseId: [{ required: true, message: '请选择' }],
       },
       editState: 0, // （刚打开窗口时）记录了上次窗口作用；（保存编辑时）记录了当前窗口作用； 0无 1新增 2修改 3查看
       addingData: {}, // 上次正在新增时的内容，下次打开dialog1窗口时记录下来