`fix`

src/views/project/list/index.vue

@@ -28,7 +28,7 @@
           </div>
         </div>
         <div class="item">
-          <div>建设单位：</div>
+          <div>建设单位(或申请单位)：</div>
           <div>
             <el-input
               v-model="searchForm.buildUnit"
@@ -39,7 +39,7 @@
         </div>
 
         <div class="item">
-          <div>存储位置：</div>
+          <div>存档位置：</div>
           <div>
             <el-input
               v-model="searchForm.saveAddr"
@@ -64,7 +64,7 @@
       </div>
       <div class="searchheard" style="margin-top: 10px">
         <div class="item">
-          <div>地址：</div>
+          <div>地址(公安门牌)：</div>
           <div>
             <el-input
               v-model="searchForm.addr"
@@ -142,10 +142,10 @@
           </template>
         </el-table-column>
         <el-table-column prop="qiuquan" label="丘权号" width="160" />
-        <el-table-column prop="buildUnit" label="建设单位" width="200" />
+        <el-table-column prop="buildUnit" label="建设单位(或申请单位)" width="200" />
         <el-table-column prop="achievementDate" label="建档日期" width="110" />
-        <el-table-column prop="saveAddr" label="存储位置" width="100" />
-        <el-table-column prop="addr" label="地址" width="180" />
+        <el-table-column prop="saveAddr" label="存档位置" width="100" />
+        <el-table-column prop="addr" label="地址(公安门牌)" width="180" />
         <el-table-column prop="community" label="小区" width="100" />
         <el-table-column prop="remark" label="备注" width="180" />
         <el-table-column prop="address" label="操作">
@@ -165,7 +165,7 @@
                   type="text"
                   size="small"
 
-                  @click="updatecurrent(scope.row.id, 2)"
+                  @click="updatecurrent(scope.row.id, -2)"
                   >提交</el-button
                 >
               </div>
@@ -309,7 +309,7 @@
           <el-input v-model="currentitem.qiuquan" placeholder="请输入丘权号" />
         </el-form-item>
 
-        <el-form-item label="建设单位：" required>
+        <el-form-item label="建设单位(或申请单位)：" required>
           <el-input v-model="currentitem.buildUnit" placeholder="请输入建设单位" />
         </el-form-item>
 
@@ -317,7 +317,7 @@
           <el-input v-model="currentitem.achievementDate" placeholder="请输入建档日期" />
         </el-form-item>
 
-        <el-form-item label="存储位置：" required>
+        <el-form-item label="存档位置：" required>
           <el-input v-model="currentitem.saveAddr" placeholder="请输入存储位置" />
         </el-form-item>
 
@@ -325,7 +325,7 @@
           <el-input type="text" v-model="currentitem.community" placeholder="请输入小区" />
         </el-form-item>
 
-        <el-form-item label="地址：">
+        <el-form-item label="地址(公安门牌)：">
           <el-input type="textarea" v-model="currentitem.addr" placeholder="请输入地址" />
         </el-form-item>
 
@@ -431,7 +431,10 @@ import {
 } from "@/api/archives/index";
 import _ from "lodash";
 import {useRoute} from "vue-router";
+import useUserStore from "@/store/modules/user";
 
+
+const userroles = useUserStore().roles;
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_area, sys_project_status } = toRefs<any>(
   proxy?.useDict("sys_area", "sys_project_status")
@@ -441,6 +444,12 @@ const shvisable = ref(false);
 const pdfviewshow = ref(false);
 const route = useRoute();
 
+var isnormal = false;
+if(userroles.indexOf("normaluser")!=-1){
+  isnormal = true
+}
+
+
 const searchForm = ref({
   area: "",
   qiuquan: "",
@@ -473,8 +482,15 @@ const getnextdata = (page: number) => {
   currentpage.value = page;
   if(route.query.status){
     searchForm.value["status"]=route.query.status;
+  }else{
+    if(isnormal){
+      searchForm.value["status"]="1";
+    }
+  }
+  if(route.fullPath.indexOf("add")!=-1){
+    searchForm.value["createBy"]=useUserStore().userId;
   }
-  console.log(searchForm.value)
+
   listArchives({ pageSize: 10, pageNum: page, ...searchForm.value }).then((res) => {
     tableData.value = res.rows;
     totalnum.value = res.total;
@@ -556,6 +572,16 @@ const editproject = (item) => {
 const projectreson = ref("");
 
 const updatecurrent = (id, status: number) => {
+  if (status == -2) {
+    ElMessageBox.confirm('确定提交审核吗?')
+      .then(() => {
+        updatecurrent(id, 2);
+      })
+      .catch(() => {
+        ElMessage.info('已取消')
+      })
+    return;
+  }
   if (status == 4 && projectreson.value == "") {
     ElMessage.warning("请输入不同意原因");
     return;