1

wesley88
1 parent c7a00a3c
Showing 19 changed files with 259 additions and 97 deletions
admin-web-master/src/api/newly.js
admin-web-master/src/components/ImageUpload/index.vue
admin-web-master/src/components/add/addcd.vue
admin-web-master/src/components/add/addht.vue
admin-web-master/src/components/add/addinformation.vue
admin-web-master/src/components/add/addmap.vue
admin-web-master/src/components/add/addsam.vue
admin-web-master/src/components/buscha/busCha.vue
admin-web-master/src/components/chakan/ggsh.vue
admin-web-master/src/components/chakan/zl.vue
admin-web-master/src/components/resourceCommodity/index.vue
admin-web-master/src/utils/request.js
admin-web-master/src/views/customer/rsaManagement/genjin.vue
admin-web-master/src/views/customer/rsaManagement/tanpan.vue
admin-web-master/src/views/detect/analyse.vue
admin-web-master/src/views/detect/examine/index.vue
admin-web-master/src/views/rent/audit/index.vue
admin-web-master/src/views/scheme/sam.vue
admin-web-master/src/views/shopRental/manage/index.vue
 import request from '@/utils/request'
 // import request from '@/utils/request2'
+// oa
+export function general(data) {
+  return request({
+    url: '/oaInterconnection/general',
+    method: 'post',
+    data,
+    // headers: {
+    //   'Content-Type': 'Multipart/form-data'
+    // }
+  })
+}
 // 生成合同附件
 export function dataInprotDocument(data) {
   return request({
-    url: '/cereContractTemplate/dataInprotDocument ',
+    url: '/cereContractTemplate/dataInprotDocument',
     method: 'post',
     data
   })
@@ -212,7 +212,7 @@
             // 更新当前文件的上传状态
             this.reactiveData.filesIng[i].status = 'uploading';
-
+            console.error(fd)
             // 调用 miniioupload 方法并等待响应
             const res = await miniioupload(fd);
             list.push(res.data)
@@ -65,7 +65,7 @@
         <el-input v-model="ruleForm.detailedLocation" placeholder="请输入"  maxlength="100">
         </el-input>
       </el-form-item> -->
-      <el-form-item label="地图标点" prop="mapMarker">
+      <el-form-item label="地图标点" prop="detailedLocation">
         <div style="width: 100%;height: 300px;">
           <newmap :isonloed="info.id?true:false" :lat="lat" :lng="lng" @updatecenter="updatecenter"></newmap>
         </div>
@@ -192,7 +192,7 @@
           }],
           detailedLocation: [{
             required: true,
-            message: '请输入详细位置',
+            message: '请地图标点选择位置',
             trigger: 'blur'
           }, ],
           mapMarker: [{
@@ -229,6 +229,8 @@ import {
           tenantTelephone: this.info.tenantTelephone,
           shopNumber: this.info.shopNumber,
           templateInformationUrl:this.templateAttachment,
+          createDate:this.updateCurrentTime(),
+          createUser: localStorage.getItem('roleName'),
         }
         console.error(from)
         let info = await this.culfj()
@@ -354,31 +356,31 @@ import {
                 }).then(res => {
                   console.error(res)
                 })
-                // if(this.info.id) {
-                //   if(this.info.cereBasicInformationShop && this.info.cereBasicInformationShop.id) {
-                //     msgedit({
-                //       auditStatus: '4',
-                //       id: this.info.id,
-                //       contractNumber: this.formInline.contractNumber
-                //     })
-                //   }
-                //   if(this.info.cereAdvertisingInformation && this.info.cereAdvertisingInformation.id) {
-                //     AdvertiserInfoEdit({
-                //       auditStatus: '4',
-                //       id: this.info.id,
-                //       contractId: this.formInline.contractNumber
-                //     }).then(item => {
-                //       this.getAll()
-                //     })
-                //   }
-                //   if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) {
-                //     msgedit({
-                //       auditStatus: '4',
-                //       id: this.info.id,
-                //       contractNumber: this.formInline.contractNumber
-                //     })
-                //   }
-                // }
+                if(this.info.id) {
+                  if(this.info.cereBasicInformationShop && this.info.cereBasicInformationShop.id) {
+                    msgedit({
+                      auditStatus: '4',
+                      id: this.info.id,
+                      contractNumber: this.formInline.contractNumber
+                    })
+                  }
+                  if(this.info.cereAdvertisingInformation && this.info.cereAdvertisingInformation.id) {
+                    AdvertiserInfoEdit({
+                      auditStatus: '4',
+                      id: this.info.id,
+                      contractId: this.formInline.contractNumber
+                    }).then(item => {
+                      this.getAll()
+                    })
+                  }
+                  if(this.info.cereBasicInformationVenue && this.info.cereBasicInformationVenue.id) {
+                    msgedit({
+                      auditStatus: '4',
+                      id: this.info.id,
+                      contractNumber: this.formInline.contractNumber
+                    })
+                  }
+                }
                 this.$emit('removeonaction', '1')
               } else {
                 this.$message({
@@ -50,7 +50,23 @@
           </el-form-item>
         </el-col>
       </el-row>
-
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
+            <el-select v-model="ruleForm.belongingGreenwaySection" placeholder="请选择"
+              style="margin-top:5px;width: 100%;" @change="lvdaoSel">
+              <el-option :label="item.name" :value="item.code" v-for="(item,index) in lvdaoList"
+                :key="index"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="门牌号" prop="houseNumber">
+            <el-input v-model="ruleForm.houseNumber" placeholder="请输入" 
+              maxlength="20"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -81,13 +97,8 @@
           </el-form-item>
         </el-col>
       </el-row>
-
-      <el-form-item label="门牌号" prop="houseNumber">
-        <el-input v-model="ruleForm.houseNumber" placeholder="请输入" 
-          maxlength="20"></el-input>
-      </el-form-item>
       <el-form-item label="详细位置" prop="detailedLocation">
-        <el-input v-model="ruleForm.detailedLocation" placeholder="请输入" maxlength="100">
+        <el-input :disabled="true" v-model="ruleForm.detailedLocation" placeholder="请地图标点选择位置" maxlength="100">
         </el-input>
       </el-form-item>
       <el-form-item label="地图标点" prop="mapPunctuation">
@@ -205,6 +216,11 @@
             message: '请选择商铺类型',
             trigger: 'blur'
           }, ],
+          belongingGreenwaySection: [{
+            required: true,
+            message: '请填写所属绿道段',
+            trigger: 'blur'
+          }, ],
           belongingRegion: [{
             required: true,
             message: '请选择所属区域',
@@ -212,7 +228,7 @@
           }],
           detailedLocation: [{
             required: true,
-            message: '请输入详细位置',
+            message: '请地图标点选择位置',
             trigger: 'blur'
           }, ],
           mapPunctuation: [{
@@ -67,7 +67,7 @@
         <el-input v-model="formInline.advertisingName" placeholder="请输入" maxlength="30"></el-input>
       </el-form-item>
       <el-form-item label="详细位置" prop="detailedLocation">
-        <el-input v-model="formInline.detailedLocation" placeholder="请输入" maxlength="50"></el-input>
+        <el-input v-model="formInline.detailedLocation"  :disabled="true"  placeholder="请地图标点选择位置" maxlength="100"></el-input>
       </el-form-item>
       <el-form-item label="地图标点" prop="mapPunctuation" >
         <!-- <div style="width: 100%;height: 300px;">
@@ -228,7 +228,7 @@
           }],
           detailedLocation: [{
             required: true,
-            message: '请输入详细位置',
+            message: '请地图标点选择位置',
             trigger: ['change']
           }],
           mapPunctuation: [{
@@ -487,6 +487,10 @@
               ceDel({
                 id: ids
               }).then(res => {
+                this.$message({
+                  message: '删除成功',
+                  type: 'success'
+                })
                 this.getmb()
                 done();
               })
@@ -97,7 +97,7 @@
                       <div class="duiqi greens" @click ="item.value?openfile(item.value):''">{{item.value?'查看详情':'暂无文件'}}</div>
                     </el-form-item>
                     <el-form-item :label="item.name" prop="paymentDay" v-else-if="item.type != '资源' && item.type != '商家'">
-                      <div class="duiqi">{{item.value}}</div>
+                      <div class="duiqi">{{item.value}}<span v-if="item.key == 'earnestMoney' || item.key == 'contractAmount'"> 元</span></div>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -239,17 +239,20 @@
         </el-tab-pane>
       </el-tabs>
     </div>
-    <div v-if="info.auditStatus == 1 && issp == '2'" style="border-top: 2px solid #eee;">
-      <div style="padding-left: 130px;margin: 25px 0;">
-        <el-radio v-model="radio" label="2">同意</el-radio>
-        <el-radio v-model="radio" label="3">拒绝</el-radio>
+    <div v-if="info.auditStatus == 1 && issp == '2'" >
+      <TitleWithCircle title="审核情况"/>
+      <div style="padding: 20px;">
+        <el-form :model="info" label-width="130px" class="demo-ruleForm">
+          <el-form-item label="状态">
+            <el-radio v-model="radio" label="2">同意</el-radio>
+            <el-radio v-model="radio" label="3">拒绝</el-radio>
+          </el-form-item>
+          <el-form-item label="审核意见">
+            <el-input maxlength="200" show-word-limit rows="4" v-model="auditComments" placeholder="请输入审核意见"
+              type="textarea" />
+          </el-form-item>
+        </el-form>
       </div>
-      <el-form :model="info" label-width="130px" class="demo-ruleForm">
-        <el-form-item label="审核意见">
-          <el-input maxlength="200" show-word-limit rows="4" v-model="auditComments" placeholder="请输入审核意见"
-            type="textarea" />
-        </el-form-item>
-      </el-form>
     </div>
     <div v-if="(info.auditStatus == '2' || info.auditStatus == '3') && xiangTab == 'first'">
       <TitleWithCircle title="审核结果"/>
@@ -217,6 +217,16 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
+                    <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
+                      <div class="duiqi">{{info.cereBasicInformationShop.belongingGreenwaySection || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="门牌号" prop="houseNumber">
+                      <div class="duiqi">{{info.cereBasicInformationShop.houseNumber || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
                     <el-form-item label="归属部门" prop="belongingDepartment">
                       <div class="duiqi">{{info.cereBasicInformationShop.belongingDepartment || '无'}}</div>
                     </el-form-item>
@@ -226,8 +236,6 @@
                       <div class="duiqi">{{info.cereBasicInformationShop.head || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row :gutter="20">
                   <el-col :span="8">
                     <el-form-item label="联系人" prop="contacts">
                       <div class="duiqi">{{info.cereBasicInformationShop.contacts || '无'}}</div>
@@ -238,13 +246,9 @@
                       <div class="duiqi">{{info.cereBasicInformationShop.telephone || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="8">
-                    
-                  </el-col>
                 </el-row>
-                <el-form-item label="门牌号" prop="houseNumber">
-                  <div class="duiqi">{{info.cereBasicInformationShop.houseNumber || '无'}}</div>
-                </el-form-item>
+
+
                 <el-form-item label="详细位置" prop="detailedLocation">
                   <div class="duiqi">{{info.cereBasicInformationShop.detailedLocation || '无'}}</div>
                 </el-form-item>
@@ -387,7 +391,7 @@
           <el-radio v-model="radio" label="3">拒绝</el-radio>
         </el-form-item>
           <el-form-item label="审核意见">
-            <el-input maxlength="200" show-word-limit rows="4" v-model="info.reviewComments" placeholder="请输入审核意见"
+            <el-input maxlength="200" show-word-limit rows="4" v-model="info.auditSuggestions" placeholder="请输入审核意见"
               type="textarea" />
           </el-form-item>
         </el-form>
@@ -401,7 +405,7 @@
             <div class="duiqi">{{info.auditStatus=='2'?'已通过':info.auditStatus=='3'?'不通过':'无'}}</div>
           </el-form-item>
           <el-form-item label="审核意见">
-            <div class="duiqi">{{info.reviewComments || '无'}}</div>
+            <div class="duiqi">{{info.auditSuggestions || '无'}}</div>
           </el-form-item>
         </el-form>
       </div>
@@ -503,7 +507,7 @@
         msgedit({
           id: this.info.id,
           'auditStatus': this.radio,
-          reviewComments: this.info.reviewComments
+          auditSuggestions: this.info.auditSuggestions
         }).then(res => {
           console.error(res)
           if (res.code == 200) {
@@ -48,6 +48,16 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
+                    <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
+                      <div class="duiqi">{{editbgid.belongingGreenwaySection || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="门牌号" prop="houseNumber">
+                      <div class="duiqi">{{editbgid.houseNumber || '无'}}</div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="8">
                     <el-form-item label="归属部门" prop="belongingDepartment">
                       <div class="duiqi">{{editbgid.belongingDepartment || '无'}}</div>
                     </el-form-item>
@@ -57,8 +67,6 @@
                       <div class="duiqi">{{editbgid.head || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                </el-row>
-                <el-row :gutter="20">
                   <el-col :span="8">
                     <el-form-item label="联系人" prop="contacts">
                       <div class="duiqi">{{editbgid.contacts || '无'}}</div>
@@ -69,13 +77,8 @@
                       <div class="duiqi">{{editbgid.telephone || '无'}}</div>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="8">
-                    
-                  </el-col>
                 </el-row>
-                <el-form-item label="门牌号" prop="houseNumber">
-                  <div class="duiqi">{{editbgid.houseNumber || '无'}}</div>
-                </el-form-item>
+  
                 <el-form-item label="详细位置" prop="detailedLocation">
                   <div class="duiqi">{{editbgid.detailedLocation || '无'}}</div>
                 </el-form-item>
@@ -17,13 +17,13 @@ let baseURL =  &#39;&#39;
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
   // baseURL = 'http://172.16.61.125:9003';
   // baseURL = 'http://128.10.249.206:9003';
-  // baseURL = 'http://10.0.0.51:9003';
+  baseURL = 'http://128.10.250.204:9003';
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // baseURL = 'http://192.168.2.225:9003';
@@ -139,7 +139,7 @@
           <el-form-item label="现场照片" >
             <div style="display:flex;flex-wrap: wrap;" v-if="msgEit" >
-              <el-image
+              <!-- <el-image
                     style="width: 100px; height: 100px;margin-right: 10px;"
                       fit="fill"
                     :src="$baseURL+item"
@@ -147,7 +147,10 @@
                     >
                     <div slot="error" class="image-slot">
-                         </div></el-image>
+                         </div></el-image> -->
+               <div style="display: flex;">
+                <allimg v-if="item" :src="item" fit="contain"  v-for="item in imgList" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+              </div>
             </div>
             <upimg filePath="yixiang" inputtype="onSitePhotos" :value="formInline.onSitePhotos"
               @changimg="e=>changimg(e,'onSitePhotos')" :limit="3" v-if="msgEit==false" ></upimg>
@@ -266,9 +269,10 @@
   import {
     getAlls as map1
   } from '../../../api/map1'
+  import allimg from '@/components/chakan/allimg.vue';
   export default {
     components: {
-      upimg
+      upimg,allimg
     },
      props: {
        message: {
@@ -102,7 +102,7 @@
           </el-form-item>
           <el-form-item label="现场照片" >
             <div v-if="msgEit" style="display:flex;flex-wrap: wrap">
-              <el-image
+              <!-- <el-image
                     style="width: 100px; height: 100px;margin-right: 10px;"
                       fit="fill"
                     :src="$baseURL+item"
@@ -110,7 +110,10 @@
                     >
                      <div slot="error" class="image-slot">
                           </div>
-                          </el-image>
+                          </el-image> -->
+              <div style="display: flex;">
+                <allimg v-if="item" :src="item" fit="contain"  v-for="item in imgList" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+              </div>
             </div>
             <upimg filePath="yixiang" inputtype="onSitePhotos" :value="formInline.onSitePhotos"
               @changimg="e=>changimg(e,'onSitePhotos')" :limit="3" v-if="msgEit==false" ></upimg>
@@ -142,6 +145,7 @@
   } from '../../../api/inr.js'
   import upimg from "@/components/ImageUpload/index"
   import upfile from "@/components/fujianUpload/fujianList"
+  import allimg from '@/components/chakan/allimg.vue';
   import {
    getAlls
   } from '../../../api/information.js'
@@ -151,7 +155,8 @@
   export default {
     components: {
       upimg,
-      upfile
+      upfile,
+      allimg
     },
      props: {
        message: {
@@ -18,9 +18,9 @@
               <el-option label="2" value="2" />
             </el-select> -->
             <el-date-picker v-model="FormTime"  value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期"
-              end-placeholder="结束日期" style="width: 200px;margin-right: 10px;ma" prefix-icon="none">
+              end-placeholder="结束日期" style="width: 300px;margin-right: 10px;" prefix-icon="none">
             </el-date-picker>
-            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">检索
+            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff;">检索
             </el-button>
             <el-button @click="resetting" class="buttonHover"
               style="color: #000;border: 1px solid #DBDBDB;background-color: #fff;">重置
@@ -85,7 +85,7 @@
           </div> -->
         </div>
         <div style="display:flex;margin-top:10px;">
-          <div style="width:48%;height: 400px;marigin-right:20px;">
+          <div style="width:48%;height: 400px;margin-right:20px;">
             <div style="display: flex;justify-content: space-between;">
               <div style="line-height:35px;">租赁意向人群统计</div>
               <!-- <div>
@@ -97,7 +97,7 @@
             </div>
             <div ref="shop2BT" style="width:100%;height: 400px;"></div>
           </div>
-          <div style="width:48%;height: 400px;marigin-right:20px;">
+          <div style="width:48%;height: 400px;margin-right:20px;">
             <div style="display: flex;justify-content: space-between;">
               <div style="line-height:35px;">意向申请数量</div>
               <!-- <div>
@@ -351,6 +351,18 @@
     },
     computed: {},
     created() {
+      //获取今天日期和一个月前的日期
+      let today = new Date();
+      let monthAgo = new Date();
+      monthAgo.setMonth(monthAgo.getMonth() - 1);
+      monthAgo.setDate(monthAgo.getDate() + 1);
+      this.pageindex.startTime = monthAgo.toISOString().slice(0, 10);
+      this.pageindex.endTime = today.toISOString().slice(0, 10);
+      this.FormTime = [
+      this.pageindex.startTime,
+      this.pageindex.endTime
+      ]
+      console.error(this.pageindex)
       this.getAll()
     },
@@ -146,9 +146,9 @@
               {{scope.row.cereBasicInformationVenue.venueType}}
             </template>
           </el-table-column>
-          <el-table-column label="实际使用面积" prop="actualUsableArea" show-overflow-tooltip>
+          <el-table-column label="实际使用面积" prop="actualArea" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{scope.row.cereBasicInformationVenue.actualUsableArea}}
+              {{scope.row.cereBasicInformationVenue.actualArea}}
             </template>
           </el-table-column>
           <el-table-column label="策略名称" prop="policyName" show-overflow-tooltip>
@@ -11,17 +11,17 @@
         <div class="formSearch">
           <el-form :inline="true" :model="pagequery">
             <el-form-item label="资源名称">
-              <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
+              <el-input v-model="pagequery.cereBasicInformationShop.shopName" placeholder="请输入" style="width:168px;" />
             </el-form-item>
-            <el-form-item label="资源类型" prop="belongingRegion">
-              <el-select v-model="pagequery.belongingRegion" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
-                <el-option label="商铺" value="商铺"></el-option>
-                <el-option label="场地" value="场地"></el-option>
+            <el-form-item label="资源类型" prop="rentalResourcesId">
+              <el-select v-model="pagequery.rentalResourcesId" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
+                <el-option label="商铺" value="sp"></el-option>
+                <el-option label="场地" value="cd"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="联系电话">
-              <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
+              <el-input v-model="pagequery.applicant" placeholder="请输入" style="width:168px;" />
             </el-form-item>
             <el-form-item label="状态" prop="auditStatus">
               <el-select v-model="pagequery.auditStatus" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
@@ -174,7 +174,11 @@
           dataStatus:'1',
           pageNumber: 0,
           pageSize: 10,
-          contractName: ''
+          applicant: '',
+          rentalResourcesId:"",
+          cereBasicInformationShop: {
+            shopName: ""
+          }
         },
         tableData: [],
         total: 0,
@@ -295,10 +299,14 @@
       //重置按钮
       resetting() {
         this.pagequery = {
+            dataStatus:'1',
             pageNumber: 0,
             pageSize: 10,
-            dataStatus:'1',
-            contractName: ''
+            applicant: '',
+            rentalResourcesId:"",
+            cereBasicInformationShop: {
+              shopName: ""
+            }
           },
           this.getAll()
       },
@@ -76,7 +76,7 @@
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
               <div @click="removeinfo(scope.row)" class="tableBtn greens">编辑</div>
-              <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div>
+              <!-- <div @click="handleDelete(scope.row)" class="tableBtn greens">删除</div> -->
             </template>
           </el-table-column>
         </el-table>
@@ -13,8 +13,16 @@
             <el-form-item label="合同名称">
               <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
             </el-form-item>
+            <el-form-item label="合同状态" prop="dataStatus">
+              <el-select v-model="pagequery.dataStatus" clearable placeholder="请选择" style="width: 168px;margin-right: 15px">
+                <el-option label="使用中" value="1"></el-option>
+                <el-option label="往期合同" value="2"></el-option>
+                <el-option label="已终止" value="3"></el-option>
+                
+              </el-select>
+            </el-form-item>
           </el-form>
-
+          
           <div>
             <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
             </el-button>
@@ -86,6 +94,7 @@
           <el-table-column label="操作" min-width="150" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
+              <div @click="OA(scope.row)" class="tableBtn greens">OA</div>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同变更')" class="tableBtn greens">合同变更</div>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同续约')" class="tableBtn greens">合同续约</div>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfozz(scope.row,'合同终止')" class="tableBtn greens">合同终止</div>
@@ -162,15 +171,16 @@
     cereContractInformation
   } from '@/api/commodityLease.js'
   import {
-    modifyResourceStatus
+    modifyResourceStatus,general
   } from '@/api/newly.js'
+  import axios from 'axios'
   export default {
     data() {
       return {
         contractChangeReason: '',
         detailsinfo: {},
         pagequery: {
-          dataStatus:'1',
+          // dataStatus:'1',
           pageNumber: 0,
           pageSize: 10,
           contractName: ''
@@ -190,6 +200,86 @@
       this.getAll()
     },
     methods: {
+      async OA(row){
+        const response = await axios.get(this.$baseURL+row.appendicesContract);
+
+        // 处理二进制数据
+        const blob = response.data;
+        console.log(blob);
+        // return
+        const base64Data = Buffer.from(blob, 'binary').toString('base64');
+        console.log(base64Data);
+        // return
+        const file = new File([blob], 'filename.txt', { type: 'text/plain' });
+        console.log(file);
+        let fd = new FormData();
+        fd.append('fileBytes', file); // 假设 formData 包含文件
+        fd.append('fileName', '"合同.txt"');
+        console.log(fd);
+        let c1 = {
+          "title":"这是一个流程",
+          "files": [
+            {
+              fileName:'合同.txt',
+              fileBytes:base64Data
+              // fileBytes:'Y4EdWbGGg6gsD4eHlUR3aUmr0Xz050KI'
+            }
+          ],
+          "reviewers": ["1768540680428331008"],
+            // "account":"zsfu-test",
+            // "password":"000009",
+            // "accessKey":"HfHJ1cDCX4PuwSC5hox0cvJCdvnNFGOC",
+            // "secretAccessKey":"t05ebUtKp06004E90bfUBv1145R49Zg4",
+            // "sponsor":"1858710592190291968",
+            // // "id":"5c19f869063e57766b127177143e5c5d",
+            // "isonData":"这里是外部系统需要传递数据集合",
+            // "messageId":"外部系统唯一id",
+            // "reviewers":['1768540680428331008','1768539930201563136']
+        }
+        // c1.files.push(fd)
+        console.log(c1);
+        general(c1).then(res => {
+
+        })
+        return
+        // URL.createObjectURL(this.$baseURL+row.appendicesContract)
+        const xhr = new XMLHttpRequest();
+        xhr.open('GET', this.$baseURL+row.appendicesContract, true);
+        xhr.responseType = 'blob'; // 设置响应类型为 blob
+
+        xhr.onload = () => {
+        if (xhr.status === 200) {
+          const blob = xhr.response;
+          console.log(blob);
+          // general({
+          //   "title":"这是一个流程",
+          //   "files": [{
+          //     "fileBytes":blob,
+          //     "fileName":"合同.txt"
+          //   }]
+          // }).then(res => {
+
+          // })
+          // 如果需要保存文件，可以创建一个 URL 对象并下载
+          const url = window.URL.createObjectURL(blob);
+          const link = document.createElement('a');
+          link.href = url;
+          console.log(link);
+          link.setAttribute('download', 'filename.ext'); // 设置下载的文件名
+          document.body.appendChild(link);
+          link.click();
+          document.body.removeChild(link);
+        } else {
+          console.error('下载文件时出错:', xhr.status);
+        }
+        };
+
+        xhr.onerror = () => {
+        console.error('下载文件时出错');
+        };
+
+        xhr.send();
+      },
       gettime() {
         // 获取当前时间
         let currentTime = new Date();
@@ -307,7 +397,7 @@
         this.pagequery = {
             pageNumber: 0,
             pageSize: 10,
-            dataStatus:'1',
+            dataStatus:'',
             contractName: ''
           },
           this.getAll()