前端孟祥旭

src/api/V2/contract/index.js

@@ -19,6 +19,6 @@ export const API_GET_BILL_OPERATE_HIS = '/billOperateHis/query/commonBillOperate
 // 修改状态
 export const API_POST_EDITSTATUS = '/contractManagementInfo/editStatus'
 //删除销售合同
-export const API_POST_CONTRACT_DELETE ='contractManagementInfo/deleteInfo '
+export const API_POST_CONTRACT_DELETE ='/contractManagementInfo/deleteInfo '
 //销售合同修改编辑
 export const API_POST_EDITINFO = '/contractManagementInfo/editInfo'

src/views/contractManagement/salesContract.vue

@@ -75,6 +75,7 @@
         >
       </template>
     </BaseHeaderLayout>
+    
     <el-table :data="tableData.records" style="width: 100%; margin-top: 10px">
       <el-table-column type="index" />
       <el-table-column prop="contractNo" label="合同编号" width="80">
@@ -95,11 +96,11 @@
           <el-popover
             placement="left"
             :width="400"
-            trigger="hover"
+            trigger="click"
             @show="history(scope.row)"
           >
-            <template #reference>
-              <span>{{ scope.row.status }}</span>
+            <template>
+              <span slot="reference">{{ scope.row.status }}</span>
             </template>
             <div>
               <p>操作历史</p>
@@ -123,7 +124,13 @@
       <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
       <el-table-column prop="mildewGrain" label="未回款（元）">
       </el-table-column>
-      <el-table-column prop="addressUrl" label="附件"> </el-table-column>
+
+      <el-table-column prop="addressUrl" label="附件">
+        <template slot-scope="scope">
+           <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i>
+        </template>
+      </el-table-column>
+
       <el-table-column prop="address" label="操作" width="300">
         <template slot-scope="scope">
           <el-button
@@ -141,13 +148,26 @@
         </template>
       </el-table-column>
     </el-table>
-    <!-- 弹出页面-审核通过 -->
-    <BaseContentModalScrap
-      v-model="dialogApproveFormVisible"
-      :title="$t('common.opinion')"
-      :isRules="false"
-      @confirm="approve"
-    />
+    
+    <!-- 附件弹框 -->
+    <WinseaContentModal
+      v-model="accessoryTFs"
+      :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose"
+    >
+      <p>查看附件</p>
+      <ws-upload
+        ref="upload"
+        table-name="maintain_work_order"
+        oss-key="mainPlan"
+        :comp-id="compId"
+        :appendix-ids="appendixIdsAdd"
+        :vesselId="deptBudgetList.addressUrl"
+        :size-limit="size"
+        @uploadSuccess="uploadSuccess"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+    </WinseaContentModal>
+
   </div>
 </template>
 <script>
@@ -158,9 +178,17 @@ import {
   billoperatehis,
   deletecontract,
 } from '@/model/contarct/index'
-import { dayjs } from 'base-core-lib'
+
+import { downloadFile } from '@/utils/batchDown'
+import Pagination from '@/components/Pagination'
+import WsUpload from '@/components/WsUpload'
+import { dayjs, fmoney, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
+  components:{
+    WsUpload,
+    Pagination,
+  },
   watch: {
     vesselId(val) {
       this.getVesselData()
@@ -192,6 +220,7 @@ export default {
         searchKeyWord:'',
         startDate:null,
         endDate: null,
+        appendixIdsAdd: '',
 
       contractType: 1,
       currentPage: 1,
@@ -200,11 +229,14 @@ export default {
       searchKeyWord:'',
       startDate: null,
       endDate: null,
-historyList:{},
+      historyList:{},
       submitType: true,
       contractForm: {},
       categoryIndex: 0,
       rulesVendor: {},
+
+
+      accessoryTFs: false,
       // pickerBeginDateBefore: {},
       tableData: [],
       taskTypeList: [
@@ -243,13 +275,35 @@ historyList:{},
     }
     
   },
-  
+   
   activated() {
     this.deletecontract()
     this.getList()
     this.showType = this.isShow
+    console.log(11111)
   },
   methods: {
+    handleClose() {
+      this.accessoryTFs = false
+    },
+    history(row) {
+      console.log(row)
+      billoperatehis({ id: row.id })
+        .toPromise()
+        .then((response) => {
+          this.historyList = response
+        })
+    },
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+
+      // this.deptBudgetList.
+      // this.formData.append('files', files)
+      // this.feedbackObj.uploadNameAttachment = data.appendixName
+      // this.feedbackObj.pathUploadAttachment = data.appendixPath
+      // // this.newAppendixs = files
+      // this.onChangeFlag = true
+    },
     // deletecontract(){
     //   deletecontract({
 
@@ -273,7 +327,22 @@ historyList:{},
         .toPromise()
         .then((response) => {
           this.tableData = response
+          this.deptCircularPage.currentPage = response.current
+          this.deptCircularPage.pageSize = response.size
+          this.deptBudgetTotal = response.total
+          this.contractList = response
         })
+    },
+     // 上传附件
+    uploadSuccess(data, files, url) {
+      console.log(data, files, url)
+
+      // this.deptBudgetList.
+      // this.formData.append('files', files)
+      // this.feedbackObj.uploadNameAttachment = data.appendixName
+      // this.feedbackObj.pathUploadAttachment = data.appendixPath
+      // // this.newAppendixs = files
+      // this.onChangeFlag = true
     },
     editClick(row) {
       var status = ''
@@ -307,14 +376,25 @@ historyList:{},
           return false
         })
     },
-    
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleClose() {
-      this.dialogViewSpareMoney = false
+    fujian(row) {
+      if (
+        row.receiveAttachmentPath === null ||
+        row.receiveAttachmentPath === ''
+      ) {
+        EventBus.$emit(
+          'warning',
+          this.$t('system.noticeCircular.NoInformation')
+        )
+      } else {
+        this.accessoryTFs = true
+      }
+      this.appendixIdss = row.receiveAttachmentPath
     },
     
+    
+    // 关闭 dialog时 处理文件url 初始化upload组件
     handleExamine(row) {
-      
+      console.log(row)
       this.$router.push({
         
         name: 'salesContractExamine',
@@ -350,6 +430,7 @@ historyList:{},
         return time.getTime() > Date.now()
       },
     },
+
     handleDelete(row){
     var handleDelete = ''
       if (row.handleDelete == '待执行' || row.handleDelete == '已完成') {
@@ -372,7 +453,7 @@ historyList:{},
                 title: '成功',
                 message: '删除成功',
               })
-              this.deletecontract()
+              this.getList()
             })
             .catch((response) => {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
@@ -464,6 +545,27 @@ historyList:{},
     }
   }
 }
+.vertical-line {
+  height: 100px;
+  border-left: 2px solid;
+  margin-left: 4px;
+}
+.vertical-circle {
+  float: left;
+  width: 10px;
+  height: 10px;
+  border: 2px solid white;
+  background-color: #08b8e6;
+  -webkit-border-radius: 100px;
+}
+.vertical-circle:first-child {
+  color: red;
+}
+.vertical-text {
+  float: left;
+  margin-top: -7px;
+}
+
 .box-app {
   display: inline-block;
   float: left;