Merge remote-tracking branch 'origin/dev_shce' into dev_shce

src/api/caseFocusOnPerson/gzryDetail.js

@@ -7,3 +7,22 @@ export const getGzryBybh = params =>
 //公职人员详情页面中关联案件信息的列表
 export const getXqGlajList = params =>
     post(`${base.alyIP}/glaj/getXqGlajList`, params);
+
+
+//公职人员证据查询
+export const getGzryZjSelect = params =>
+    post(`${base.alyIP}/temp/select`, params);
+
+
+//公职人员证据上传
+export const getGzryZjUp = params =>
+    post(`${base.alyIP}/temp/upload`, params);
+
+//公职人员证据下载
+export const getGzryZjDown = params =>
+    post(`${base.alyIP}/temp/download`, params);
+
+
+//公职人员证据删除
+export const getGzryZjDel = params =>
+    post(`${base.alyIP}/temp/delete`, params);
\ No newline at end of file

src/views/caseFocusOnPerson/gzryForm.vue

 <template>
-  <div class="xsform"
+  <div id="gzryFormPage" class="xsform"
        v-loading="loading">
     <div class="header">
       <i class="iconfont iconzonghedangan"></i><span>{{ isAlter ? "修改" : "新增" }}公职人员信息</span>
@@ -24,8 +24,19 @@
                 :propSt="stZjxx"
                 class="callForm"
         >
-
         </form-commonPage>
+      <div class="callForm" style="margin-left: 52px;margin-top: 20px">
+        <el-upload
+                class="upload-demo"
+                action=""
+                :on-remove="handleRemove"
+                :on-change="handleChange"
+                :on-preview="handlerPreview"
+                :limit="3"
+                :file-list="fileList">
+          <el-button size="small" type="primary">证据上传</el-button>
+        </el-upload>
+      </div>
 
 
       <div class="relateCaseForm">
@@ -114,7 +125,7 @@
 import FormCommonPage from "@c/myFormCommonPage.vue";
 import { queryCodeByType } from "@/api/xsInput/xsInput.js";
 import { getGzGlajList } from "@/api/caseFocusOnPerson/gzryForm.js";
-import { getXqGlajList } from "@/api/caseFocusOnPerson/gzryDetail.js";
+import { getXqGlajList, getGzryZjSelect,getGzryZjUp,getGzryZjDown,getGzryZjDel } from "@/api/caseFocusOnPerson/gzryDetail.js";
 import { getGzryBybh, updateAjGzry } from "@/api/caseFocusOnPerson/gzry";
 import { addGzry } from "@/api/caseFocusOnPerson/gzry";
 import utilTool from "@/utils/util.js";
@@ -151,7 +162,6 @@ export default {
           value: "",
           isShow2: true,
           placeholder: "",
-          isBlock: true,
           col: "2",
         },
         {
@@ -202,18 +212,8 @@ export default {
           value: "",
           isShow2: true,
           placeholder: "",
-          col: "2",
+          col: "6",
           disabled: true
-        },
-        {
-          name: '一审判决书:',
-          id: 'zjFlws',
-          type: 'file',
-          value: '',
-          col: '7',
-          requestUrl: '',
-          fileList: [],
-          prop: ''
         }
       ],
 
@@ -578,7 +578,8 @@ export default {
       isAlter: false,
       relatedCaseSelection: new Set(),
       propSt: "gzry",
-      tableLoading: false
+      tableLoading: false,
+      fileList: []
     };
   },
   created () {
@@ -588,6 +589,34 @@ export default {
     this.getRelatedCase();
   },
   methods: {
+
+    handleRemove(file, fileList) {
+      getGzryZjSelect({
+
+      }).then(res => {
+
+      })
+
+      this.fileList = fileList;
+
+
+      //console.log(file, fileList);
+    },
+    handleChange(file, fileList){
+
+
+
+      //console.log(file, fileList)
+    },
+
+    //下载法律文书
+    handlerPreview (file, fileList) {
+
+
+
+      //console.log("点击下载")
+    },
+
     //初始化表单
     initFields () {
       var self = this;
@@ -1487,6 +1516,37 @@ export default {
 </script>
 
 <style lang="scss">
+
+  #gzryFormPage .el-upload-list__item {
+    width: auto;
+    width: 372px;
+    height: 37px;
+    display: inline-block;
+    border: 1px solid #cfcfcf;
+    margin-right: 15px;
+  }
+
+  .el-upload-list__item .el-icon-close {
+    top: 9px;
+    right: 13px;
+  }
+  #formCommonPage .el-upload-list__item {
+    /* width: auto; */
+    display: inline-block;
+    margin-right: 12px;
+    width: 280px;
+    height: 40px;
+  }
+  .el-upload-list__item-name {
+    line-height: 36px;
+    padding-left: 20px;
+
+    font-size: 12px;
+    font-family: Microsoft YaHei;
+    font-weight: 400;
+    color: #333333;
+  }
+
 .xsform {
   height: 100%;
   padding-top: 72px;

vue.config.js

@@ -63,7 +63,8 @@ module.exports = {
       // http://39.98.114.80:8081/tldxyr/getXyrList
       "/api": {
         // target: "http://192.168.0.107:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
-        target: "http://192.168.1.116:8080/",
+        //target: "http://192.168.1.116:8080/",
+        target: "http://localhost:8081/",
         ws: true,
         changeOrigin: true,
         pathRewrite: {
@@ -72,7 +73,8 @@ module.exports = {
       },
       "/ap": {
         // target: "http://192.168.1.117:8080/",
-        target: "http://26.13.5.68:8001/", //内蒙
+        //target: "http://26.13.5.68:8001/", //内蒙
+        target: "http://localhost:8081/",
         ws: true,
         changeOrigin: true,
         pathRewrite: {
@@ -80,7 +82,8 @@ module.exports = {
         }
       },
       "/api2": {
-        target: "http://133.8.5.1:8501/", //证件号码登录
+        //target: "http://133.8.5.1:8501/", //证件号码登录
+        target: "http://localhost:8081/",
         ws: true,
         changeOrigin: true,
         pathRewrite: {