苏木乡镇规划补正入口提交

website/.env.production

@@ -9,9 +9,9 @@ port = '5000'
 #VITE_APP_BASE_API = 'http://192.168.60.40:8080'
 #VITE_ARC_SERVER_API = 'http://192.168.100.252:6080'
 #察哈尔右翼前旗部署环境
-#VITE_APP_BASE_API = 'http://10.254.151.54:8080'
-#VITE_ARC_SERVER_API = 'http://10.254.151.54:6080'
-#VITE_APP_SSO_BASE_API = 'http://10.255.137.105:8080'
+VITE_APP_BASE_API = 'http://10.254.151.54:8080'
+VITE_ARC_SERVER_API = 'http://10.254.151.54:6080'
+VITE_APP_SSO_BASE_API = 'http://10.255.137.105:8080'
 
 #凉城部署环境
 #VITE_APP_BASE_API = 'http://10.254.150.98:8080'
@@ -19,9 +19,9 @@ port = '5000'
 #VITE_APP_SSO_BASE_API = 'http://10.255.137.105:8080'
 
 #准格尔旗部署环境
-VITE_APP_BASE_API = 'http://10.254.98.222:8080'
-VITE_ARC_SERVER_API = 'http://10.254.98.222:6080'
-VITE_APP_SSO_BASE_API = 'http://10.255.134.200:8080'
+#VITE_APP_BASE_API = 'http://10.254.98.222:8080'
+#VITE_ARC_SERVER_API = 'http://10.254.98.222:6080'
+#VITE_APP_SSO_BASE_API = 'http://10.255.134.200:8080'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli
 #VITE_BUILD_COMPRESS = gzip

website/src/views/ghcgscygl/ghcgsb/Search.vue

@@ -25,21 +25,46 @@
             </el-select>
           </el-form-item>
           <el-form-item label="行政区:">
-            <el-cascader :options="xzoptions" :props="{
-              ...props,
-              checkStrictly: true,
-              expandTrigger: 'hover',
-            }" v-model="xzqCode" clearable ref="cascader" @change="setXzqdm" class="cascader-style" style="width: 90%"
-              popper-class="popper-cascader" :filterable="true" :show-all-levels="false"></el-cascader>
+            <el-cascader
+              :options="xzoptions"
+              :props="{
+                ...props,
+                checkStrictly: true,
+                expandTrigger: 'hover',
+              }"
+              v-model="xzqCode"
+              clearable
+              ref="cascader"
+              @change="setXzqdm"
+              class="cascader-style"
+              style="width: 90%"
+              popper-class="popper-cascader"
+              :filterable="true"
+              :show-all-levels="false"
+            ></el-cascader>
           </el-form-item>
-          <el-button type="primary" @click="changeForm" style="margin-left: 20px">查询</el-button>
+          <el-button
+            type="primary"
+            @click="changeForm"
+            style="margin-left: 20px"
+            >查询</el-button
+          >
         </el-form>
       </div>
     </div>
     <div class="table-layout flex-box column height-100-60">
       <div class="table max-width height-100-50">
-        <el-table ref="multipleTable" :data="tableData1" style="width: 100%" border fit cell-class-name="cell-item"
-          height="100%" tooltip-effect="dark" v-show="formInline.status == '1'">
+        <el-table
+          ref="multipleTable"
+          :data="tableData1"
+          style="width: 100%"
+          border
+          fit
+          cell-class-name="cell-item"
+          height="100%"
+          tooltip-effect="dark"
+          v-show="formInline.status == '1'"
+        >
           <el-table-column prop="id" label="记录主键" align="center">
           </el-table-column>
           <el-table-column prop="subject" label="标题" align="center">
@@ -56,20 +81,45 @@
           </el-table-column>
           <el-table-column prop="status" label="状态" align="center">
           </el-table-column>
-          <el-table-column label="操作" align="center" type="flex" justity="space-between" width="220">
+          <el-table-column
+            label="操作"
+            align="center"
+            type="flex"
+            justity="space-between"
+            width="220"
+          >
             <template #default="scope">
               <div class="">
-                <el-button type="primary" size="mini" @click="open(scope.row)"
-                  style="display: inline-block">审批记录</el-button>
-                <el-button type="primary" size="mini" style="display: inline-block" @click="download(scope.row)"
-                  v-if="formInline.planType == '1'">审查报告</el-button>
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="open(scope.row)"
+                  style="display: inline-block"
+                  >审批记录</el-button
+                >
+                <el-button
+                  type="primary"
+                  size="mini"
+                  style="display: inline-block"
+                  @click="download(scope.row)"
+                  >审查报告</el-button
+                >
               </div>
             </template>
           </el-table-column>
         </el-table>
 
-        <el-table ref="multipleTable2" :data="tableData2" style="width: 100%" border fit cell-class-name="cell-item"
-          height="100%" tooltip-effect="dark" v-show="formInline.status == '2' || formInline.status == '3'">
+        <el-table
+          ref="multipleTable2"
+          :data="tableData2"
+          style="width: 100%"
+          border
+          fit
+          cell-class-name="cell-item"
+          height="100%"
+          tooltip-effect="dark"
+          v-show="formInline.status == '2' || formInline.status == '3'"
+        >
           <el-table-column prop="id" label="记录主键" align="center">
           </el-table-column>
           <el-table-column prop="title" label="成果名称" align="center">
@@ -84,64 +134,143 @@
           </el-table-column>
           <el-table-column prop="executor" label="执行人" align="center">
           </el-table-column>
-          <el-table-column label="操作" align="center" type="flex" justity="space-between" width="220">
+          <el-table-column
+            label="操作"
+            align="center"
+            type="flex"
+            justity="space-between"
+            width="220"
+          >
             <template #default="scope">
               <div class="">
-                <el-button type="primary" size="mini" @click="open(scope.row)"
-                  style="display: inline-block">审批记录</el-button>
-                <el-button v-if="formInline.status == '3'" type="primary" size="mini" @click="xbUpload(scope.row)"
-                  style="display: inline-block">修编</el-button>
-                <el-button v-if="
-                  ($store.getters.roles.join(',').indexOf('common') > -1 ||
-                    $store.getters.roles.join(',').indexOf('manager') > -1) &&
-                  scope.row &&
-                  scope.row.nodename == '补正'
-                  && formInline.status == '2'
-                " type="primary" size="mini" @click="upload(scope.row)" style="display: inline-block"
-                  :disabled="instids.indexOf(scope.row.instid) > -1">补正</el-button>
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click="open(scope.row)"
+                  style="display: inline-block"
+                  >审批记录</el-button
+                >
+                <el-button
+                  v-if="formInline.status == '3'"
+                  type="primary"
+                  size="mini"
+                  @click="xbUpload(scope.row)"
+                  style="display: inline-block"
+                  >修编</el-button
+                >
+                <el-button
+                  v-if="
+                    ($store.getters.roles.join(',').indexOf('common') > -1 ||
+                      $store.getters.roles.join(',').indexOf('manager') > -1) &&
+                    scope.row &&
+                    scope.row.nodename == '补正' &&
+                    formInline.status == '2'
+                  "
+                  type="primary"
+                  size="mini"
+                  @click="upload(scope.row)"
+                  style="display: inline-block"
+                  :disabled="instids.indexOf(scope.row.instid) > -1"
+                  >补正</el-button
+                >
               </div>
             </template>
           </el-table-column>
         </el-table>
       </div>
       <div class="flex-box footer height-50 flex-box align-center box-sizing">
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-          :current-page="formInline.current" :page-sizes="[10, 20, 50, 100]" :page-size="formInline.size" background
-          :pager-count="5" layout="total, sizes, prev, pager, next, jumper" :total="formInline.total">
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="formInline.current"
+          :page-sizes="[10, 20, 50, 100]"
+          :page-size="formInline.size"
+          background
+          :pager-count="5"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="formInline.total"
+        >
         </el-pagination>
       </div>
     </div>
-    <ShjlDialog v-model:list="shjllist" v-model:ShjlDialog="shjlShow" v-if="shjlShow" style="margin-top: 300px">
+    <ShjlDialog
+      v-model:list="shjllist"
+      v-model:ShjlDialog="shjlShow"
+      v-if="shjlShow"
+      style="margin-top: 300px"
+    >
     </ShjlDialog>
-    <GhcgDialog v-if="ztghDialog" v-model:ghcgscDialog="ztghDialog" :isCity="$store.getters.roles.join(',').indexOf('common') > -1 ? false : true
-      " :instid="instid" @refresh="changeForm" @getlist="changeForm"></GhcgDialog>
-    <CzghcgDialog v-if="ghcgscDialog" v-model:ghcgscDialog="ghcgscDialog" :instid="instid" @refresh="changeForm"
-      @getlist="changeForm"></CzghcgDialog>
-    <XxghcgDialog v-if="xxghcgscDialog" v-model:xxghcgscDialog="xxghcgscDialog" :instid="instid" @refresh="changeForm"
-      @getlist="changeForm"></XxghcgDialog>
-    <el-dialog title="修编上传" v-model="dialogVisible" style="width: 360px; height: 400px" :before-close="handleClose"
-      append-to-body>
+    <GhcgDialog
+      v-if="ztghDialog"
+      v-model:ghcgscDialog="ztghDialog"
+      :isCity="false"
+      :instid="instid"
+      @refresh="changeForm"
+      @getlist="changeForm"
+    ></GhcgDialog>
+    <CzghcgDialog
+      v-if="ghcgscDialog"
+      v-model:ghcgscDialog="ghcgscDialog"
+      :instid="instid"
+      @refresh="changeForm"
+      @getlist="changeForm"
+    ></CzghcgDialog>
+    <XxghcgDialog
+      v-if="xxghcgscDialog"
+      v-model:xxghcgscDialog="xxghcgscDialog"
+      :instid="instid"
+      @refresh="changeForm"
+      @getlist="changeForm"
+    ></XxghcgDialog>
+    <el-dialog
+      title="修编上传"
+      v-model="dialogVisible"
+      style="width: 360px; height: 400px"
+      :before-close="handleClose"
+      append-to-body
+    >
       <div style="width: 100%; height: 100%">
         <el-form label-width="100px">
           <el-form-item label="选择文件">
-            <el-upload ref="fileUploadBtn" :limit="1" :file-list="fileList" :on-change="handleChangeFile"
-              :on-remove="handleRemove" :auto-upload="false" :show-file-list="true">
+            <el-upload
+              ref="fileUploadBtn"
+              :limit="1"
+              :file-list="fileList"
+              :on-change="handleChangeFile"
+              :on-remove="handleRemove"
+              :auto-upload="false"
+              :show-file-list="true"
+            >
               <el-button size="small" type="primary">点击上传</el-button>
             </el-upload>
           </el-form-item>
           <el-form-item label="记录主键">
-            <el-input readonly v-model="xbform.id" placeholder="请输入记录主键"></el-input>
+            <el-input
+              readonly
+              v-model="xbform.id"
+              placeholder="请输入记录主键"
+            ></el-input>
           </el-form-item>
           <el-form-item label="名称">
-            <el-input readonly v-model="xbform.title" placeholder="请输入名称"></el-input>
+            <el-input
+              readonly
+              v-model="xbform.title"
+              placeholder="请输入名称"
+            ></el-input>
           </el-form-item>
           <el-form-item label="流程主键">
-            <el-input readonly v-model="xbform.instid" placeholder="请输入流程主键"></el-input>
+            <el-input
+              readonly
+              v-model="xbform.instid"
+              placeholder="请输入流程主键"
+            ></el-input>
           </el-form-item>
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="xbSubmit()" size="small">修编</el-button>
+        <el-button type="primary" @click="xbSubmit()" size="small"
+          >修编</el-button
+        >
       </span>
     </el-dialog>
   </div>
@@ -181,7 +310,7 @@ export default {
         xbfile: null,
         id: "",
         title: "",
-        instid: ""
+        instid: "",
       },
       formInline: {
         status: "1",
@@ -321,11 +450,9 @@ export default {
       },
       upload(row) {
         qxyh.instid = row.instid;
-        if (qxyh.formInline.planType == "1") {
-          qxyh.ztghDialog = true;
-        } else if (qxyh.formInline.planType == "2") {
+        if (qxyh.formInline.planType == "2") {
           qxyh.ghcgscDialog = true;
-        } else if (qxyh.formInline.planType == "3") {
+        } else {
           qxyh.ztghDialog = true;
         }
       },
@@ -384,10 +511,7 @@ export default {
           getLandGetAllTasks(qxyh.formInline).then((res) => {
             qxyh.formInline.total = res.total || 999;
             //待办的村庄规划需要检查补正的状态，未补正的可以上传成果包
-            if (
-              qxyh.formInline.planType == 2 ||
-              qxyh.formInline.planType == 3
-            ) {
+            if (qxyh.formInline.planType == 2) {
               getInstIds().then((res2) => {
                 qxyh.instids = res2.data.join(",");
                 qxyh.tableData2 = res.data;
@@ -416,10 +540,7 @@ export default {
             qxyh.formInline.current = 1;
             qxyh.formInline.total = res.total || 999;
             //待办的村庄规划需要检查补正的状态，未补正的可以上传成果包
-            if (
-              qxyh.formInline.planType == 2 ||
-              qxyh.formInline.planType == 3
-            ) {
+            if (qxyh.formInline.planType == 2) {
               getInstIds().then((res2) => {
                 qxyh.instids = res2.data.join(",");
                 qxyh.tableData2 = res.data;