附件调整

src/views/buyingBack/buyingBackAdd.vue

@@ -144,6 +144,7 @@
                     :before-upload="$common.beforeUploadJustWordExcel"
                   >
                     <el-button v-if="!isView" size="small" type="primary">点击上传</el-button>
+                    <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                     <div slot="file" slot-scope="{file}">
                       <a :href="file.url">{{ file.name }}</a>
                       <span v-show="!isView" class="el-upload-list__item-actions">

src/views/buyingMore/buyingMoreAdd.vue

@@ -144,6 +144,7 @@
                     :before-upload="$common.beforeUploadJustWordExcel"
                   >
                     <el-button v-if="!isView" size="small" type="primary">点击上传</el-button>
+                    <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                     <div slot="file" slot-scope="{file}">
                       <a :href="file.url">{{ file.name }}</a>
                       <span v-show="!isView" class="el-upload-list__item-actions">

src/views/customerManagement/intentionalDeposit/addIntentionalDeposit.vue

@@ -133,6 +133,7 @@
                     :before-upload="$common.beforeUploadJustWordExcel"
                   >
                     <el-button size="small" type="primary">点击上传</el-button>
+                    <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                     <div slot="file" slot-scope="{file}" style="overflow:hidden;white-space: nowrap;text-overflow:ellipsis">
                       <el-tooltip class="item" effect="dark" :content="file.name" placement="top-start">
                         <a :href="file.url">{{ file.name }}</a>

src/views/customerManagement/subscribe/addSubscribe.vue

@@ -105,6 +105,7 @@
                     :before-upload="$common.beforeUploadJustWordExcel"
                   >
                     <el-button size="small" type="primary">点击上传</el-button>
+                    <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                     <div slot="file" slot-scope="{file}" style="overflow:hidden;white-space: nowrap;text-overflow:ellipsis">
                       <el-tooltip class="item" effect="dark" :content="file.name" placement="top-start">
                         <a :href="file.url">{{ file.name }}</a>

src/views/parkAssets/parkFloorDisc/index.vue

@@ -493,6 +493,7 @@
                           :before-upload="beforeLogoUploadJustImage"
                         >
                           <el-button size="small" type="primary">点击上传</el-button>
+                          <div slot="tip" class="el-upload__tip">只能上传JPG,PNG,GIF,BMP文件，且不超过5MB，数量不超过6张</div>
                           <div slot="file" slot-scope="{file}" class="file-row">
                             <a target="_blank" :href="file.url">{{ file.name }}</a>
                             <span class="el-upload-list__item-actions">

src/views/receiveRefundsManagement/intentionalDepositManagement/toDeposit.vue

@@ -26,12 +26,12 @@
                   <el-input v-model="form.serialNumber" />
                 </el-form-item>
               </el-col>
-<!--              <el-col :span="3" class="col-txt"><span>定金编号</span></el-col>-->
-<!--              <el-col :span="9" class="col-input">-->
-<!--                <el-form-item>-->
-<!--                  <el-input v-model="form.depositSerialNumber" />-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
+              <!--              <el-col :span="3" class="col-txt"><span>定金编号</span></el-col>-->
+              <!--              <el-col :span="9" class="col-input">-->
+              <!--                <el-form-item>-->
+              <!--                  <el-input v-model="form.depositSerialNumber" />-->
+              <!--                </el-form-item>-->
+              <!--              </el-col>-->
             </el-row>
             <el-row>
               <el-col :span="3" class="col-txt"><span><span class="red-asterisk">*</span>认购房屋</span></el-col>
@@ -69,6 +69,7 @@
                     :before-upload="beforeLogoUploadJustImage"
                   >
                     <el-button v-if="!isView" size="small" type="primary">点击上传</el-button>
+                    <div slot="tip" class="el-upload__tip">只能上传JPG,PNG,GIF,BMP文件，且不超过5MB，数量不超过6张</div>
                     <div slot="file" slot-scope="{file}" style="overflow:hidden;white-space: nowrap;text-overflow:ellipsis">
                       <el-tooltip class="item" effect="dark" :content="file.name" placement="top-start">
                         <a :href="file.url">{{ file.name }}</a>

src/views/receiveRefundsManagement/maintenanceFundsManagement/addFunds.vue

@@ -95,6 +95,7 @@
                     :before-upload="beforeLogoUploadJustImage"
                   >
                     <el-button v-if="!isView" size="small" type="primary">点击上传</el-button>
+                    <div slot="tip" class="el-upload__tip">只能上传JPG,PNG,GIF,BMP文件，且不超过5MB，数量不超过6张</div>
                     <div slot="file" slot-scope="{file}" style="overflow:hidden;white-space: nowrap;text-overflow:ellipsis">
                       <el-tooltip class="item" effect="dark" :content="file.name" placement="top-start">
                         <a :href="file.url">{{ file.name }}</a>
@@ -251,7 +252,7 @@ export default {
             })
         },
         bankChange(data) {
-            const val = this.bankOptions.find((e) => { return  data == e.id })
+            const val = this.bankOptions.find((e) => { return data == e.id })
             this.form.bankName = val.bankName
             this.form.bankBranchName = val.bankBranchName
             this.form.bankNumber = val.bankNumber

src/views/receiveRefundsManagement/paymentManagement/addPayment.vue

@@ -124,6 +124,7 @@
                     :before-upload="beforeLogoUploadJustImage"
                   >
                     <el-button v-if="!isView" size="small" type="primary">点击上传</el-button>
+                    <div slot="tip" class="el-upload__tip">只能上传JPG,PNG,GIF,BMP文件，且不超过5MB，数量不超过6张</div>
                     <div slot="file" slot-scope="{file}" style="overflow:hidden;white-space: nowrap;text-overflow:ellipsis">
                       <el-tooltip class="item" effect="dark" :content="file.name" placement="top-start">
                         <a :href="file.url">{{ file.name }}</a>

src/views/receiveRefundsManagement/refundManagement/addRefund.vue

@@ -189,6 +189,7 @@
                     :before-upload="beforeLogoUploadJustImage"
                   >
                     <el-button v-if="!isView" size="small" type="primary">点击上传</el-button>
+                    <div slot="tip" class="el-upload__tip">只能上传JPG,PNG,GIF,BMP文件，且不超过5MB，数量不超过6张</div>
                     <div slot="file" slot-scope="{file}" style="overflow:hidden;white-space: nowrap;text-overflow:ellipsis">
                       <el-tooltip class="item" effect="dark" :content="file.name" placement="top-start">
                         <a :href="file.url">{{ file.name }}</a>

src/views/reportForms/components/projectDetail.vue

@@ -0,0 +1,161 @@
+<template>
+  <div>
+    <div>
+      <el-row class="handle-box">
+        <el-col :span="24">
+          <span class="card_title">项目基础信息</span>
+        </el-col>
+      </el-row>
+      <el-row class="handle-box">
+        <el-col :span="8">
+          <span>项目/小区名称:</span>
+          <span>{{ groupForm.groupName }}</span>
+        </el-col>
+        <el-col :span="8">
+          <span>性质:</span>
+          <span>{{ groupForm.nature }}</span>
+        </el-col>
+        <el-col :span="8">
+          <span>预销售许可证编号:</span>
+          <span>{{ groupForm.roomSelectionNumber }}</span>
+        </el-col>
+      </el-row>
+      <el-row class="handle-box">
+        <el-col :span="8">
+          <span>开发公司:</span>
+          <span>{{ groupForm.companyName }}</span>
+        </el-col>
+        <el-col :span="8">
+          <span>总建筑面积:</span>
+          <span>{{ groupForm.buildArea }}</span>
+        </el-col>
+        <el-col :span="8">
+          <span>总用地面积:</span>
+          <span>{{ groupForm.landArea }}</span>
+        </el-col>
+      </el-row>
+      <el-row class="handle-box">
+        <el-col :span="8">
+          <span>立项批文:</span>
+          <span>{{ groupForm.projectApprovalDocument }}</span>
+        </el-col>
+        <el-col :span="8">
+          <span>工程规划许可证:</span>
+          <span>{{ groupForm.engineeringPlanningPermit }}</span>
+        </el-col>
+        <el-col :span="8">
+          <span>施工许可证:</span>
+          <span>{{ groupForm.constructionPermit }}</span>
+        </el-col>
+      </el-row>
+      <el-row class="handle-box">
+        <el-col :span="8">
+          <span>土地证号:</span>
+          <span>{{ groupForm.landCertificateNumber }}</span>
+        </el-col>
+        <el-col :span="8">
+          <span>用地许可证号:</span>
+          <span>{{ groupForm.landUsePermitNumber }}</span>
+        </el-col>
+        <el-col :span="8">
+          <span>容积率%:</span>
+          <span>{{ groupForm.volumeRatio }}</span>
+        </el-col>
+      </el-row>
+      <el-row class="handle-box">
+        <el-col :span="8">
+          <span>绿化率%:</span>
+          <span>{{ groupForm.greenRatio }}</span>
+        </el-col>
+        <el-col :span="8">
+          <span>标准单价:</span>
+          <span>{{ groupForm.price }}</span>
+        </el-col>
+        <el-col :span="8">
+          <span>容积率%:</span>
+          <span>{{ groupForm.exceededPrice }}</span>
+        </el-col>
+      </el-row>
+      <el-row class="handle-box">
+        <el-col :span="8">
+          <span>楼盘面积测绘状态:</span>
+          <span>{{ groupForm.areaStatus }}</span>
+        </el-col>
+        <el-col :span="8">
+          <span>楼盘销售状态:</span>
+          <span>{{ groupForm.saleStatus }}</span>
+        </el-col>
+        <el-col :span="8">
+          <span>行政区划:</span>
+          <span>{{ groupForm.regionalismCode }}</span>
+        </el-col>
+      </el-row>
+      <el-row class="handle-box">
+        <span>行政区划:</span>
+        <span>{{ groupForm.address }}</span>
+      </el-row>
+
+      <el-divider />
+
+      <el-row class="handle-box" />
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+import Base from '@/views/base/base.vue'
+import BaseData from '@/views/base/baseData.vue'
+
+export default {
+    name: 'ProjectDetailVue',
+    components: { },
+    mixins: [Base, BaseData],
+    props: {
+        // 确认从哪个页面跳转过来的,这样可以做相应的操作
+        fromAddress: {
+            type: String,
+            default: ''
+        }
+    },
+    data() {
+        return {
+            dc_key: ['DECORATION_SITUATION'],
+            groupForm: {}
+        }
+    },
+    mounted() {
+
+    },
+    methods: {
+        initData(data) {
+            this.initDict(this.dc_key).then((res) => {
+
+            })
+        },
+        getGroupData() {
+            const postData = {
+
+            }
+            this.baseRequest('getById',postData).then(res=>{
+
+            })
+        },
+        getItemJson: function(item) {
+            return item
+        },
+        cancel(data) {
+            this.$emit('cancel', data)
+        },
+        baseRequest(opUrl, postData) {
+            return this.$channel.globeRequest('ParkInfoController', opUrl, postData, 'project')
+        }
+
+    }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/reportForms/parkRoomArchives.vue

@@ -10,8 +10,6 @@
           style="width: 100%"
           clearable
           filterable
-          :popper-append-to-body="false"
-          popper-class="statistic_base"
           @change="handleSearch"
         >
           <el-option
@@ -19,8 +17,6 @@
             :key="item.value"
             :label="item.label"
             :value="item.value"
-            :popper-append-to-body="false"
-            popper-class="statistic_base"
           />
         </el-select>
       </el-col>
@@ -33,8 +29,6 @@
           style="width: 100%"
           clearable
           filterable
-          :popper-append-to-body="false"
-          popper-class="statistic_base"
           @change="handleSearch"
         >
           <el-option
@@ -42,31 +36,6 @@
             :key="item.value"
             :label="item.label"
             :value="item.value"
-            :popper-append-to-body="false"
-            popper-class="statistic_base"
-          />
-        </el-select>
-      </el-col>
-      <el-col :span="2">
-        <div style="text-align: center"><span>单元/楼栋</span></div>
-      </el-col>
-      <el-col :span="4">
-        <el-select
-          v-model="search.buildId"
-          style="width: 100%"
-          clearable
-          filterable
-          :popper-append-to-body="false"
-          popper-class="statistic_base"
-          @change="handleSearch"
-        >
-          <el-option
-            v-for="item in buildOption"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-            :popper-append-to-body="false"
-            popper-class="statistic_base"
           />
         </el-select>
       </el-col>

src/views/reportForms/projectArchives.vue

@@ -2,24 +2,48 @@
   <div>
     <el-row class="handle-box" style="margin-bottom: 10px">
       <el-col :span="2">
-        <span>分期</span>
+        <div style="text-align: center"><span>楼盘</span></div>
       </el-col>
       <el-col :span="4">
-        <el-cascader
-          v-model="search.findids"
-          :append-to-body="false"
-          :options="options"
+        <el-select
+          v-model="search.groupId"
+          style="width: 100%"
           clearable
-          :props="{ multiple: true}"
+          filterable
+          @change="handleSearch"
+        >
+          <el-option
+            v-for="item in groupOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-col>
+      <el-col :span="2">
+        <div style="text-align: center"><span>分期</span></div>
+      </el-col>
+      <el-col :span="4">
+        <el-select
+          v-model="search.discId"
           style="width: 100%"
-          @change="handleChange"
-        />
+          clearable
+          filterable
+          @change="handleSearch"
+        >
+          <el-option
+            v-for="item in discOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
       </el-col>
       <el-col :span="2">
-        <span>关键字</span>
+        <div style="text-align: center"><span>关键字</span></div>
       </el-col>
       <el-col :span="4">
-        <el-input v-model="search.groupName" />
+        <el-input v-model="search.roomNo" />
       </el-col>
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px">
@@ -37,23 +61,18 @@
           border
           :header-cell-style="{background:'#f2f2f2'}"
         >
-          <el-table-column type="index" width="60" />
-          <el-table-column label="小区-分期" prop="groupDiscName" width="150" />
-          <el-table-column label="意向金流水号" prop="serialNumber" width="150" />
-          <el-table-column label="买受人" prop="buyerName" width="200" />
-          <el-table-column label="意向金金额" prop="receivedAmount" width="150" />
-          <el-table-column label="状态" prop="statusStr" width="110" />
-          <el-table-column label="定金编号" prop="depositSerialNumber" />
-          <el-table-column label="认购房屋" prop="houseName" />
-          <el-table-column label="经办人" prop="createdName" />
-          <el-table-column label="经办时间" prop="createdAt" />
-          <el-table-column header-align="center" label="操作" width="430">
+          <el-table-column label="序号" type="index" width="60" />
+          <el-table-column label="楼盘" prop="groupName" />
+          <el-table-column label="分期" prop="discName" />
+          <el-table-column label="楼栋数" prop="buildCount" />
+          <el-table-column label="房屋总数" prop="roomCount" />
+          <el-table-column label="待签约" prop="waitSigningCount" />
+          <el-table-column label="已签约" prop="signingCount" />
+          <el-table-column label="已结清数" prop="settledCount" />
+          <el-table-column label="已入户数" prop="enteredCount" />
+          <el-table-column header-align="center" label="操作">
             <template scope="scope">
-              <el-button :disabled="scope.row.status !== 1" size="mini" type="text" @click="handleToDeposit(scope.row)">转定金</el-button>
               <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
-              <el-button :disabled="scope.row.status === 1" size="mini" type="text" @click="downLoad(scope.row)">意向金收据</el-button>
-              <el-button :disabled="scope.row.status === 2" size="mini" type="text" @click="handleRefund(scope.row)">退意向金</el-button>
-              <el-button :disabled="!(scope.row.status === 1)" size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -72,19 +91,32 @@
       </el-col>
     </el-row>
 
+    <!-- 详情页面 -->
+    <el-dialog
+      :title="'项目详情'"
+      :visible.sync="dialogVisible"
+      width="75%"
+      top="50px"
+      :close-on-press-escape="false"
+      :close-on-click-modal="false"
+      append-to-body
+    >
+      <project-detail
+        v-if="dialogVisible"
+        ref="projectDetail"
+      />
+    </el-dialog>
+
   </div>
 </template>
 <script>
 import Base from '@/views/base/base'
 import BaseData from '@/views/base/baseData'
-import ToDeposit from '@/views/receiveRefundsManagement/intentionalDepositManagement/toDeposit.vue'
-import RefundIntentionalDeposit from '@/views/receiveRefundsManagement/intentionalDepositManagement/refundIntentionalDeposit.vue'
-import constant from '@/static/utils/constant'
-import AddIntentionalDeposit from '@/views/customerManagement/intentionalDeposit/addIntentionalDeposit.vue'
+import projectDetail from '@/views/reportForms/components/projectDetail.vue'
 
 export default {
     name: 'ProjectArchivesVue',
-    components: { },
+    components: { projectDetail },
     mixins: [Base, BaseData],
     data() {
         return {
@@ -95,20 +127,46 @@ export default {
             AllData: [],
             loading: false,
             options: [],
-            dialogVisible: false
+            dialogVisible: false,
+            groupOption: [],
+            discOption: [],
+            buildOption: []
         }
     },
     mounted() {
-        this.getTreeSelectData()
+        this.getGroupOption()
+        this.getDiscOption()
         this.initDict(this.dc_key).then((res) => {
             this.getData()
         })
     },
     methods: {
-        getTreeSelectData: function() {
-            this.baseInfoRequest('getTreeData3', {}).then((res) => {
-                this.options = res.data.data
-            }).catch(() => {
+        getGroupOption() {
+            this.baseGroupRequest('listAll', {}).then((res) => {
+                const data = res.data
+                this.groupOption = []
+                data.forEach(item => {
+                    const obj = {
+                        value: item.groupId,
+                        label: item.groupName,
+                        key: item.groupId
+                    }
+                    this.groupOption.push(obj)
+                })
+            })
+        },
+        getDiscOption() {
+            this.baseDiscRequest('listAll', {}).then((res) => {
+                const data = res.data
+                this.discOption = []
+                data.forEach(item => {
+                    const obj = {
+                        value: item.id,
+                        label: item.name,
+                        key: item.id
+                    }
+                    this.discOption.push(obj)
+                })
             })
         },
         getData: function() {
@@ -118,7 +176,7 @@ export default {
 
             this.search.pageNum = this.currentPage
             this.search.pageSize = this.pageSize
-            this.baseRequest('list', this.search).then((res) => {
+            this.baseRequest('reportList', this.search).then((res) => {
                 if (res.data.rows) {
                     res.data.rows.forEach(function(item) {
                         const json = _this.getItemJson(item)
@@ -144,23 +202,27 @@ export default {
             this.handleSearch()
         },
         getItemJson: function(item) {
-            item.statusStr = this.dc_map.INTENTIONAL_DEPOSIT_STATUS[item.status]
             return item
         },
         handleView(val) {
             this.dialogVisible = true
             this.dialogTitle = '查看'
-            val.isView = true
             // 新vue时调用的方法
             this.$nextTick(() => {
-                this.$refs.toDeposit.initData(val)
+                this.$refs.projectDetail.initData(val)
             })
         },
         cancel: function() {
             this.dialogVisible = false
         },
         baseRequest(opUrl, postData) {
-            return this.$channel.globeRequest('IntentionalDepositController', opUrl, postData, '')
+            return this.$channel.globeRequest('CustomerManagementController', opUrl, postData, '')
+        },
+        baseGroupRequest(opUrl, postData) {
+            return this.$channel.globeRequest('ParkInfoController', opUrl, postData, 'project')
+        },
+        baseDiscRequest(opUrl, postData) {
+            return this.$channel.globeRequest('ParkFloorDiscController', opUrl, postData, 'project')
         }
     }
 }

src/views/signingManagement/contractManagement/contractAdd.vue

@@ -315,6 +315,7 @@
                     :before-upload="$common.beforeUploadJustWordExcel"
                   >
                     <el-button v-if="!isView" size="small" type="primary">点击上传</el-button>
+                    <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                     <div slot="file" slot-scope="{file}">
                       <a :href="file.url">{{ file.name }}</a>
                       <span v-show="!isView" class="el-upload-list__item-actions">
@@ -338,6 +339,7 @@
                     :before-upload="$common.beforeUploadJustWordExcel"
                   >
                     <el-button v-if="!isView" size="small" type="primary">点击上传</el-button>
+                    <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                     <div slot="file" slot-scope="{file}">
                       <a :href="file.url">{{ file.name }}</a>
                       <span v-show="!isView" class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyAgainBuyingMore.vue

@@ -71,7 +71,7 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="7">
+                <el-col :span="24">
                   <el-form-item label="相关附件">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
@@ -83,6 +83,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">
@@ -136,7 +137,7 @@ import UserSelect from '@/views/components/UserSelect'
 
 const applyAddWorkTime = { useTime: 0 }
 export default {
-    name: 'applyAgainContract',
+    name: 'ApplyAgainContract',
     components: {
         upload, UserSelect
     },

src/views/workflow/components/myProcess/applyAgainCheckIn.vue

@@ -71,7 +71,7 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="7">
+                <el-col :span="24">
                   <el-form-item label="相关附件">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
@@ -83,6 +83,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyAgainContract.vue

@@ -71,7 +71,7 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="7">
+                <el-col :span="24">
                   <el-form-item label="相关附件">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
@@ -83,6 +83,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">
@@ -136,7 +137,7 @@ import UserSelect from '@/views/components/UserSelect'
 
 const applyAddWorkTime = { useTime: 0 }
 export default {
-    name: 'applyAgainContract',
+    name: 'ApplyAgainContract',
     components: {
         upload, UserSelect
     },

src/views/workflow/components/myProcess/applyAgainFinance.vue

@@ -71,7 +71,7 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="7">
+                <el-col :span="24">
                   <el-form-item label="相关附件">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
@@ -83,6 +83,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">
@@ -136,7 +137,7 @@ import UserSelect from '@/views/components/UserSelect'
 
 const applyAddWorkTime = { useTime: 0 }
 export default {
-    name: 'applyAgainContract',
+    name: 'ApplyAgainContract',
     components: {
         upload, UserSelect
     },

src/views/workflow/components/myProcess/applyAgainInvoiceRed.vue

@@ -71,7 +71,7 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="7">
+                <el-col :span="24">
                   <el-form-item label="相关附件">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
@@ -83,6 +83,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">
@@ -136,7 +137,7 @@ import UserSelect from '@/views/components/UserSelect'
 
 const applyAddWorkTime = { useTime: 0 }
 export default {
-    name: 'applyAgainContract',
+    name: 'ApplyAgainContract',
     components: {
         upload, UserSelect
     },

src/views/workflow/components/myProcess/applyAgainPayment.vue

@@ -117,7 +117,7 @@
                 </el-col>
                 <!--                  <el-col :span="24">formData.applyPayMoneyUppercase={{formData.applyPayMoneyUppercase}}</el-col>-->
 
-                <el-col :span="7">
+                <el-col :span="24">
                   <el-form-item label="相关附件">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
@@ -129,6 +129,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyAgainReceivablesAdjust.vue

@@ -71,7 +71,7 @@
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="7">
+                <el-col :span="24">
                   <el-form-item label="相关附件">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
@@ -83,6 +83,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">
@@ -136,7 +137,7 @@ import UserSelect from '@/views/components/UserSelect'
 
 const applyAddWorkTime = { useTime: 0 }
 export default {
-    name: 'applyAgainContract',
+    name: 'ApplyAgainContract',
     components: {
         upload, UserSelect
     },

src/views/workflow/components/myProcess/applyBuyingMore.vue

@@ -72,7 +72,7 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="7">
+                <el-col :span="24">
                   <el-form-item label="相关附件">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
@@ -84,6 +84,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">
@@ -148,7 +149,7 @@ const redLinestyle = {
 }
 
 export default {
-    name: 'applyContract',
+    name: 'ApplyContract',
     components: {
         upload, UserSelect
     },

src/views/workflow/components/myProcess/applyBuyingMoreConfirm.vue

@@ -73,6 +73,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyBuyingMoreDetail.vue

@@ -76,6 +76,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyCheckIn.vue

@@ -73,7 +73,7 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="7">
+                <el-col :span="24">
                   <el-form-item label="相关附件">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
@@ -85,6 +85,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyCheckInConfirm.vue

@@ -68,6 +68,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">
@@ -189,7 +190,7 @@ import PaymentCanvas from '@/views/workflow/components/myProcess/paymentCanvas.v
 
 const applyAddWorkTime = { useTime: 0 }
 export default {
-    name: 'applyCheckInConfirm',
+    name: 'ApplyCheckInConfirm',
     components: {
         upload,
         UserSelect,

src/views/workflow/components/myProcess/applyCheckInDetail.vue

@@ -76,6 +76,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyContract.vue

@@ -73,7 +73,7 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="7">
+                <el-col :span="24">
                   <el-form-item label="相关附件">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
@@ -85,6 +85,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">
@@ -149,7 +150,7 @@ const redLinestyle = {
 }
 
 export default {
-    name: 'applyContract',
+    name: 'ApplyContract',
     components: {
         upload, UserSelect
     },

src/views/workflow/components/myProcess/applyContractConfirm.vue

@@ -73,6 +73,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">
@@ -404,22 +405,22 @@ export default {
         },
 
         async handelConfirm() {
-            window.location.href = 'http://112.25.69.137:8088//workflow/request/ViewRequestOS.jsp?reflush=1'
-            // this.$refs['elForm'].validate(async valid => {
-            //     // if (!valid) return
-            //     // ApplyAddWorkController/AddConfirmResultAddWork
-            //     console.log(this.confirmForm)
-            //     this.loading = true
-            //     const { data } = await this.baseRequest1('ApplyContractController', 'AddConfirmResult', { ...this.confirmForm })
-            //     if (data.code == 200) {
-            //         this.loading = false
-            //         this.$message.success('处理成功')
-            //         this.form = {}
-            //         this.confirmForm = { confirmContent: '' }
-            //         this.dialogVisible = false
-            //         this.$emit('getData')
-            //     }
-            // })
+            // window.location.href = 'http://112.25.69.137:8088/workflow/request/ViewRequestOS.jsp?reflush=1'
+            this.$refs['elForm'].validate(async valid => {
+                // if (!valid) return
+                // ApplyAddWorkController/AddConfirmResultAddWork
+                console.log(this.confirmForm)
+                this.loading = true
+                const { data } = await this.baseRequest1('ApplyContractController', 'AddConfirmResult', { ...this.confirmForm })
+                if (data.code == 200) {
+                    this.loading = false
+                    this.$message.success('处理成功')
+                    this.form = {}
+                    this.confirmForm = { confirmContent: '' }
+                    this.dialogVisible = false
+                    this.$emit('getData')
+                }
+            })
         },
         findRoomTree: function() {
             const _this = this

src/views/workflow/components/myProcess/applyContractDetail.vue

@@ -76,6 +76,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyFinance.vue

@@ -73,7 +73,7 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="7">
+                <el-col :span="24">
                   <el-form-item label="相关附件">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
@@ -85,6 +85,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">
@@ -149,7 +150,7 @@ const redLinestyle = {
 }
 
 export default {
-    name: 'applyContract',
+    name: 'ApplyContract',
     components: {
         upload, UserSelect
     },

src/views/workflow/components/myProcess/applyFinanceConfirm.vue

@@ -73,6 +73,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyFinanceDetail.vue

@@ -76,6 +76,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyInvoiceRed.vue

@@ -73,7 +73,7 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="7">
+                <el-col :span="24">
                   <el-form-item label="相关附件">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
@@ -85,6 +85,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">
@@ -149,7 +150,7 @@ const redLinestyle = {
 }
 
 export default {
-    name: 'applyContract',
+    name: 'ApplyContract',
     components: {
         upload, UserSelect
     },

src/views/workflow/components/myProcess/applyInvoiceRedConfirm.vue

@@ -73,6 +73,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyInvoiceRedDetail.vue

@@ -76,6 +76,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyPayment.vue

@@ -120,7 +120,7 @@
                 </el-col>
                 <!--                  <el-col :span="24">formData.applyPayMoneyUppercase={{formData.applyPayMoneyUppercase}}</el-col>-->
 
-                <el-col :span="7">
+                <el-col :span="24">
                   <el-form-item label="相关附件">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
@@ -132,6 +132,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyPaymentConfirm.vue

@@ -128,6 +128,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyPaymentDetail.vue

@@ -130,6 +130,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyReceivablesAdjust.vue

@@ -73,7 +73,7 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="7">
+                <el-col :span="24">
                   <el-form-item label="相关附件">
                     <el-upload
                       :action="$constant.BASE_URI+'/FileController/upload'"
@@ -85,6 +85,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">
@@ -149,7 +150,7 @@ const redLinestyle = {
 }
 
 export default {
-    name: 'applyContract',
+    name: 'ApplyContract',
     components: {
         upload, UserSelect
     },

src/views/workflow/components/myProcess/applyReceivablesAdjustConfirm.vue

@@ -73,6 +73,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">

src/views/workflow/components/myProcess/applyReceivablesAdjustDetail.vue

@@ -76,6 +76,7 @@
                       :before-upload="$common.beforeUploadJustWordExcel"
                     >
                       <el-button size="small" type="primary">上传附件</el-button>
+                      <div slot="tip" class="el-upload__tip">只能上传pdf、doc、docx、xls、xlsx文件，且不超过5MB，数量不超过6</div>
                       <div slot="file" slot-scope="{file}">
                         <a :href="file.url">{{ file.name }}</a>
                         <span class="el-upload-list__item-actions">
@@ -163,7 +164,7 @@ const redLinestyle = {
 }
 const applyAddWorkTime = { useTime: 0 }
 export default {
-    name: 'applyContractDetail',
+    name: 'ApplyContractDetail',
     components: {
         PaymentCanvas,
         upload,