Merge branch 'master' of http://47.110.251.215:3000/web/saber into master

src/views/certificate/lists/addList.vue

@@ -262,7 +262,9 @@ export default {
         certificateUserId: '',
         pfxType: '',
         certificateFileUrl: [],//证书文件
+        certificateFileName: '',//证书文件名称
         signatureFileUrl: [],//签名体图片
+        signatureFileName: '',//签名体图片文件名称
         signPfxDeputieList: [],
       },
       rules: {
@@ -302,13 +304,17 @@ export default {
             pfxType: this.form.pfxType
           }
           if (this.form.certificateFileUrl[0].name) {
-            fromData.certificateFileUrl = await this.addFileInfo(this.form.certificateFileUrl[0].raw)
+            let fileData = await this.addFileInfo(this.form.certificateFileUrl[0].raw);
+            fromData.certificateFileUrl = fileData.link;
+            fromData.certificateFileName = fileData.originalName;
           } else {
             fromData.certificateFileUrl = this.form.certificateFileUrl[0].raw
           }
 
           if (this.form.signatureFileUrl[0].name) {
-            fromData.signatureFileUrl = await this.addFileInfo(this.form.signatureFileUrl[0].raw)
+            let fileData = await this.addFileInfo(this.form.signatureFileUrl[0].raw);
+            fromData.signatureFileUrl = fileData.link;
+            fromData.signatureFileName = fileData.originalName;
           } else {
             fromData.signatureFileUrl = this.form.signatureFileUrl[0].raw
           }
@@ -390,8 +396,8 @@ export default {
       const { data: res } = await getById({ id: this.$route.query.id })
       if (res.code == 200) {
         this.form = res.data
-        this.form.certificateFileUrl = [{ raw: res.data.certificateFileUrl }]
-        this.form.signatureFileUrl = [{ raw: res.data.signatureFileUrl }]
+        this.form.certificateFileUrl = [{ raw: res.data.certificateFileUrl, name: this.form.certificateFileName}]
+        this.form.signatureFileUrl = [{ raw: res.data.signatureFileUrl, name: this.form.signatureFileName }]
       }
     },
     async save (da) {//新增
@@ -433,7 +439,7 @@ export default {
       fromData.append('file', file);
       const { data: res } = await addFileInfo(fromData)
       if (res.code == 200) {
-        return res.data.link
+        return res.data;
       }
     },
     async update (da) {//编辑保存接口

src/views/certificate/managements/see.vue

@@ -72,7 +72,8 @@
                   :src="item.signatureFileUrl"
                 />
               </div>
-              <div class="flexItemsC">证书:{{item.certificateUserName}}- {{item.certificateFileUrl|urlsplice}}</div>
+              <div class="flexItemsC" style="width:600px;">证书:  {{item.certificateUserName}}- {{item.certificateFileUrl|urlsplice}}</div>
+              <div class="flexItemsC" v-show="item.pfxType != '-1'">签章类型: {{item.pfxType}}</div>
             </div>
             <el-button
               size="mini"

src/views/news/news.vue

@@ -66,6 +66,7 @@
         <el-select
           v-model="curRow.currentLink"
           placeholder="请选择"
+          @change="operationMethods"
         >
           <el-option
             label="进入人工预处理环境"
@@ -77,6 +78,16 @@
           />
         </el-select>
       </div>
+      <div class="flex jc-al-c" v-show="operation.show">
+        <span class="mg-r-20" style="font-size: 25px">预计处理截止时间</span>
+        <el-date-picker
+          v-model="operation.manageTime"
+          type="date"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期"
+        ></el-date-picker>
+      </div>
       <span
         slot="footer"
         class="dialog-footer"
@@ -100,6 +111,10 @@ export default {
       activeIndex: "1",
       curRow: {},
       dialogVisible: false,
+      operation:{
+        manageTime: '',
+        show: false
+      },
       page: {
         total: 1,
         currentPage: 1,
@@ -175,6 +190,12 @@ export default {
     init () {
       this.queryBusinessUserOpinionList()
     },
+    operationMethods(){
+      this.operation.show = this.curRow.currentLink == 2;
+      if(!this.operation.show){
+        this.operation.manageTime = '';
+      }
+    },
     openPreview (imageUrl, index) {
       let imageUrls = []
       imageUrl.forEach(val => {
@@ -189,6 +210,7 @@ export default {
     },
     changeProgres (row) {
       this.curRow = { ...row }
+      this.operation.show = this.curRow.currentLink == 2;
       this.dialogVisible = true;
     },
     handleSelect (key) {//消息分类菜单激活回调
@@ -199,7 +221,8 @@ export default {
         currentLinkId: this.curRow.currentLinkId,
         currentLink: this.curRow.currentLink,
         newNumber: this.curRow.newNumber,
-        userOpinionId: this.curRow.userOpinionId
+        userOpinionId: this.curRow.userOpinionId,
+        manageTime: this.operation.manageTime
       })
     },
     //#region 分页