Browse Source

几个小问题提交

wanger 4 tháng trước cách đây
mục cha
commit
842366368c

+ 1 - 1
website/src/components/ghcgscygl/ghcgsb/xxgh/czgh/Qxyh/czghcgDialog.vue

@@ -200,7 +200,7 @@ export default {
       xzoptions: [],
       cascader: ref(null),
       rules: {
-        year: [{ required: true, message: "请输入时间", trigger: "blur" }],
+        /*year: [{ required: true, message: "请输入时间", trigger: "blur" }],*/
       },
       loading: {},
       //导入前判断

+ 19 - 18
website/src/components/ghcgscygl/ghcgsb/ztgh/ghcgDialog.vue

@@ -9,6 +9,25 @@
               </el-option>
             </el-select>
           </el-form-item></el-col>
+          
+        <el-col>
+          <el-form-item label="上传成果包:" prop="file" style="position: relative; font-weight: 600">
+            <el-input style="width: 90%" autocomplete="off" readonly></el-input>
+            <el-upload action="#" :http-request="addFileToFormData" v-model:file-list="fileList">
+              <!-- // 去掉边框// 去掉点击按钮后的边框 -->
+              <el-button slot="trigger" type="primary" style="
+                  height: 90%;
+                  padding: 0;
+                  position: absolute;
+                  top: 1px;
+                  right: 45px;
+                  background-color: #fff;
+                  color: #169bd5;
+                  border: none;
+                  outline: none;
+                " @click="upload">选择</el-button></el-upload>
+          </el-form-item>
+        </el-col>
         <el-col>
           <el-form-item label="成果名称:" prop="name">
             <el-input v-model="formData.name" placeholder="请输入XXX旗XXXX年现状评估成果" style="width: 90%"
@@ -33,24 +52,6 @@
             <el-input v-model="formData.xzqmc" style="width: 90%" autocomplete="off" disabled></el-input>
           </el-form-item>
         </el-col>
-        <el-col>
-          <el-form-item label="上传成果包:" prop="file" style="position: relative; font-weight: 600">
-            <el-input style="width: 90%" autocomplete="off" readonly></el-input>
-            <el-upload action="#" :http-request="addFileToFormData" v-model:file-list="fileList">
-              <!-- // 去掉边框// 去掉点击按钮后的边框 -->
-              <el-button slot="trigger" type="primary" style="
-                  height: 90%;
-                  padding: 0;
-                  position: absolute;
-                  top: 1px;
-                  right: 45px;
-                  background-color: #fff;
-                  color: #169bd5;
-                  border: none;
-                  outline: none;
-                " @click="upload">选择</el-button></el-upload>
-          </el-form-item>
-        </el-col>
         <el-col>
           <el-form-item label="报批单位:" prop="bpdw">
             <el-input v-model="formData.bpdw" placeholder="默认为当前账户所在旗县局" style="width: 90%"

+ 1 - 1
website/src/components/ghss/fzxmxz/xzjg.vue

@@ -268,7 +268,7 @@ export default {
         });
       },
       downReport(){
-          window.open(xzjg.model.zip, "_blank");
+          window.open(xzjg.model.zipfile, "_blank");
       },
       loadJgMap() {
         if (xzjg.layer == null) {

+ 65 - 5
website/src/views/ghcgscygl/ghcgsb/xxgh/Czgh/Qxyh.vue

@@ -4,7 +4,7 @@
       <div class="header-left">
         <el-form :inline="true" :model="formInline">
           <el-form-item label="成果包名称:">
-            <el-input v-model="formInline.fileName" type="text"></el-input>
+            <el-input clearable v-model="formInline.fileName" type="text"></el-input>
           </el-form-item>
           <el-form-item label="行政区:" style="width: 280px">
             <el-cascader :options="xzoptions" :props="{
@@ -79,10 +79,13 @@
             <template #default="scope">
               <div class="max-width">
                 <slot name="xq" :item="scope.row">
-                  <el-button type="text" class="caozuo" @click="detail(scope.row)">详情</el-button>
-                  <!-- :disabled="
-                      uploadStatus1(scope.row.uploadStatus) !== '上传成功'
-                    " -->
+                  <el-button
+                    type="text"
+                    v-if="scope.row.bz"
+                    class="caozuo"
+                    @click="xmDetail(scope.row.bz)"
+                    >详情</el-button
+                  >
                 </slot>
                 <slot name="startjqsc" :item="scope.row">
                   <el-button type="text" class="caozuo" v-if="scope.row.status == '10' && !scope.row.msg"
@@ -109,6 +112,15 @@
                       uploadStatus1(scope.row.uploadStatus) !== '上传成功'
                     " -->
                 </slot>
+                <slot name="rz">
+                  <el-button
+                    type="text"
+                    class="caozuo"
+                    v-if="scope.row.msg"
+                    @click="showRzDialog(scope.row.msg)"
+                    >日志</el-button
+                  >
+                </slot>
                 <slot name="sc" v-if="
                   $store.getters.roles.indexOf('admin') < 0
                 ">
@@ -188,6 +200,32 @@
     </CzghcgDialog>
     <CzghbjDialog v-if="ghcgbjDialog" v-model:ghcgbjDialog="ghcgbjDialog" @refresh="changeForm" @getlist="getlist"
       v-model:cgb="activeCgb"></CzghbjDialog>
+      <el-dialog
+      v-model="xmDetailDialogVisible"
+      :title="xmDetailDialogTitle"
+      :before-close="handleClose"
+      :align-center="true"
+      style="
+        white-space: initial;
+        overflow: hidden;
+        width: 850px;
+        height: 600px;
+      "
+    >
+      <el-descriptions
+        column="2"
+        border="true"
+        style="overflow-y: auto; width: 100%; height: 500px"
+      >
+        <el-descriptions-item
+          v-for="(value, key) in xmDetailInfo"
+          :key="key"
+          :label="key"
+        >
+          {{ value }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
   </div>
 </template>
 
@@ -215,6 +253,9 @@ export default {
     const { proxy } = getCurrentInstance();
     const parent = { ...context };
     const qxyh = reactive({
+      xmDetailDialogVisible: false,
+      xmDetailDialogTitle: "基本信息",
+      xmDetailInfo: {},
       formInline: {
         xzqCode: "", // 行政区代码
         xzqName: "", // 行政区名称
@@ -265,6 +306,19 @@ export default {
       uuidList: [],
       uuidList1: "",
       showType: "",
+      xmDetail(detail) {
+        try {
+          let info = JSON.parse(detail);
+          console.log(info);
+          qxyh.xmDetailDialogVisible = true;
+          qxyh.xmDetailInfo = info;
+        } catch {
+          this.$alert(detail, "详情", {
+            confirmButtonText: "关闭",
+            type: "warning",
+          });
+        }
+      },
       handleSizeChange(val) {
         qxyh.formInline.limit = val;
         qxyh.getlist();
@@ -363,6 +417,12 @@ export default {
         qxyh.startjqscVisible = true;
         qxyh.jqscform.cgid = row.uuid;
       },
+      showRzDialog(msg) {
+        this.$alert(msg, "上报日志", {
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
+      },
       startsc() {
         this.$refs.jqscformModel.validate(function (valid, msg) {
           if (valid) {

+ 77 - 10
website/src/views/ghcgscygl/ghcgsb/ztgh/Qxjghcg/Qxyh.vue

@@ -3,7 +3,7 @@
     <div class="header flex-box align-center box-sizing">
       <div class="header-left">
         <el-form :inline="true" :model="formInline">
-          <el-form-item label="年份:">
+          <!-- <el-form-item label="年份:">
             <el-select v-model="formInline.year" placeholder="全部">
               <el-option label="" value="">全部</el-option>
               <el-option label="2024" value="2024"></el-option>
@@ -16,6 +16,17 @@
               <el-option label="2017" value="2017"></el-option>
               <el-option label="2016" value="2016"></el-option>
             </el-select>
+          </el-form-item> -->
+          <el-form-item label="成果包名称:">
+            <el-input clearable v-model="formInline.name" type="text"></el-input>
+          </el-form-item>
+          <el-form-item label="行政区:" style="width: 280px">
+            <el-cascader :options="xzoptions" :props="{
+              ...props,
+              checkStrictly: true,
+              expandTrigger: 'hover',
+            }" v-model="formInline.xzqdm" clearable ref="cascader" class="cascader-style" @change="setXzqdm"
+              popper-class="popper-cascader" :filterable="true" :show-all-levels="false"></el-cascader>
           </el-form-item>
           <el-form-item label="上报状态:">
             <el-select v-model="formInline.uploadstatus" placeholder="全部">
@@ -47,8 +58,8 @@
           </el-table-column>
           <el-table-column prop="name" label="规划成果名称" align="center">
           </el-table-column>
-          <el-table-column prop="year" label="规划成果时间" align="center">
-          </el-table-column>
+          <!-- <el-table-column prop="year" label="规划成果时间" align="center">
+          </el-table-column> -->
           <el-table-column prop="xzqmc" label="行政区" align="center">
           </el-table-column>
           <!-- <el-table-column prop="fileupload" label="上传状态"
@@ -97,7 +108,10 @@
             <template #default="scope">
               <div class="max-width">
                 <slot name="xq" :item="scope.row">
-                  <el-button type="text" class="caozuo" @click="detail(scope.row)">详情</el-button>
+                  <slot name="xq" :item="scope.row">
+                    <el-button type="text" v-if="scope.row.fileuploadremark" class="caozuo"
+                      @click="xmDetail(scope.row.fileuploadremark)">详情</el-button>
+                  </slot>
                   <slot name="startjqsc" :item="scope.row">
                     <el-button type="text" class="caozuo" v-if="scope.row.fileupload == '9'"
                       @click="startscmodel(scope.row)" :disabled="scope.row.fileupload != '9'">发起审查</el-button>
@@ -130,6 +144,10 @@
                   <el-button type="text" class="caozuo" @click="downLoadCgFile(scope.row.id)"
                     :disabled="!scope.row.id">下载</el-button>
                 </slot>
+                <slot name="rz">
+                  <el-button type="text" class="caozuo" v-if="scope.row.loginfo"
+                    @click="showRzDialog(scope.row.loginfo)">日志</el-button>
+                </slot>
                 <slot name="sc" v-if="
                   $store.getters.roles.indexOf('common') > -1 ||
                   $store.getters.roles.indexOf('manager') > -1
@@ -205,6 +223,19 @@
     <XqDialog v-model:ckxqDialog="ckxqDialog" v-model:cgDetail="activeCg"></XqDialog>
     <ChDialog v-if="chDialog" v-model:chDialog="chDialog" v-model:cgDetail="activeCg" @refresh="changeForm"></ChDialog>
     <SbjdDialog v-model:sbjdDialog="sbjdDialog" v-model:cgDetail="activeCg"></SbjdDialog>
+    <el-dialog v-model="xmDetailDialogVisible" :title="xmDetailDialogTitle" :before-close="handleClose"
+      :align-center="true" style="
+        white-space: initial;
+        overflow: hidden;
+        width: 850px;
+        height: 600px;
+      ">
+      <el-descriptions column="2" border="true" style="overflow-y: auto; width: 100%; height: 500px">
+        <el-descriptions-item v-for="(value, key) in xmDetailInfo" :key="key" :label="key">
+          {{ value }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
   </div>
   <errorLog v-model:dialogLog="dialogLog" v-model:logData="logData" v-model:logName="logName"></errorLog>
 </template>
@@ -220,7 +251,7 @@ import XqDialog from "@/components/ghcgscygl/ghcgsb/ztgh/xqDialog.vue";
 import ChDialog from "@/components/ghcgscygl/ghcgsb/ztgh/chDialog.vue";
 import SbjdDialog from "@/components/ghcgscygl/ghcgsb/ztgh/sbjdDialog.vue";
 import request from "@/utils/request.js";
-import { GetXzqList } from "@/api/homeApi.js";
+import { GetXzq, GetXzqList } from "@/api/homeApi.js";
 import { scmxlist, startcgsc } from "@/api/ghcgysc/cggl.js";
 import { cgInfoList, cgDelete, updateCgInfo } from "@/api/ghcgysc/cgsbApi.js";
 import errorLog from "@/components/ghfxpj/wtsbztyy/errorLog.vue";
@@ -254,6 +285,10 @@ export default {
       }
     );
     const qxyh = reactive({
+      cascader: ref(null),
+      xmDetailDialogVisible: false,
+      xmDetailDialogTitle: "基本信息",
+      xmDetailInfo: {},
       startjqscVisible: false,
       formLabelWidth: "120px",
       jqscform: {
@@ -273,6 +308,7 @@ export default {
       logName: "", // 错误数据名称
       formInline: {
         year: "", // 规划成果时间
+        name: "",//成果名称
         xzqdm: "", // 行政区代码
         uploadstatus: "", // 上报状态
         username: "", // 用户名
@@ -282,6 +318,7 @@ export default {
         limit: 20,
         total: 0,
       },
+      xzoptions: [],
       sbjdText: "0/0",
       sbjdPercentage: 0,
       sbjdProgress: false,
@@ -301,6 +338,19 @@ export default {
       editId: "",
       name: "",
       showType: "",
+      xmDetail(detail) {
+        try {
+          let info = JSON.parse(detail);
+          console.log(info);
+          qxyh.xmDetailDialogVisible = true;
+          qxyh.xmDetailInfo = info;
+        } catch {
+          this.$alert(detail, "详情", {
+            confirmButtonText: "关闭",
+            type: "warning",
+          });
+        }
+      },
       // 查看审查结果
       viewSCJG(data) {
         parent.emit("update:showTypeInfo", { type: "scjg", info: data });
@@ -323,6 +373,12 @@ export default {
         qxyh.startjqscVisible = true;
         qxyh.jqscform.cgid = row.id;
       },
+      showRzDialog(msg) {
+        this.$alert(msg, "上报日志", {
+          confirmButtonText: "关闭",
+          type: "warning"
+        });
+      },
       startsc() {
         this.$refs.jqscformModel.validate(function (valid, msg) {
           if (valid) {
@@ -431,6 +487,12 @@ export default {
           });
         }
       },
+      // 获取行政区数据
+      setXzqdm(bsm) {
+        if (typeof qxyh.cascader.getCheckedNodes()[0] !== "undefined") {
+          qxyh.formInline.xzqdm = qxyh.cascader.getCheckedNodes()[0].value;
+        }
+      },
       websocketOnMessage(msg1) {
         let msg = msg1.data;
         if (msg.indexOf("/") > -1) {
@@ -498,13 +560,18 @@ export default {
       },
       // 获取行政区数据
       getXzqdm() {
-        GetXzqList().then((res) => {
-          const xzq = res.data.find(
-            (item) => item.label === store.getters.user.dept.deptName
-          );
-          qxyh.formInline.xzqdm = !xzq ? "" : xzq.value;
+        GetXzq({ city: true }).then((res) => {
+          if (res.success) {
+            qxyh.xzoptions = proxy.$comfun.resetTree(res.data);
+          }
           qxyh.getlist();
         });
+        // GetXzqList().then((res) => {
+        //   const xzq = res.data.find(
+        //     (item) => item.label === store.getters.user.dept.deptName
+        //   );
+        //   qxyh.formInline.xzqdm = !xzq ? "" : xzq.value;
+        // });
       },
       // 获取列表数据
       getlist() {

+ 2 - 2
website/src/views/ghcgscygl/ghcgsb/ztgh/Sjghcg.vue

@@ -66,8 +66,8 @@
           </el-table-column>
           <el-table-column prop="name" label="规划成果名称" align="center">
           </el-table-column>
-          <el-table-column prop="year" label="规划成果时间" align="center">
-          </el-table-column>
+          <!-- <el-table-column prop="year" label="规划成果时间" align="center">
+          </el-table-column> -->
           <el-table-column prop="xzqmc" label="行政区" align="center">
           </el-table-column>
           <el-table-column prop="fileupload" label="上传状态" align="center">