0905zhyc

src/components/Finance/royaltypg.vue

@@ -10,7 +10,7 @@
                             </el-select>
                         </el-form-item>
                         <el-form-item label="部门">
-                            <el-select  style="width:200px" @change="depchange" v-model="depvalue" placeholder="请选择部门">
+                            <el-select  style="width:120px" @change="depchange" v-model="depvalue" placeholder="请选择部门">
                               <el-option v-for="(item,index) in depOption" :key="index" :label="item.depName" :value="item.depId"></el-option>
                             </el-select>
                         </el-form-item>
@@ -36,6 +36,7 @@
                             <el-button style="margin-left: 10px;" @click="ComputeRoyalties" type="primary">查 询</el-button>
                             <el-button @click="derivelist" type="primary">导出提成列表</el-button>
                             <el-button @click="RoyaltyConfirmByFin" type="primary">发送通知给国交同事进行提成确认</el-button>
+                            <el-button type="primary">查看已确定</el-button>
                         </div>
                     </div>
                 </el-form>

src/components/Resource/OpInvitationOfficialActivityData.vue

@@ -309,12 +309,12 @@ export default {
                     that.OpInvitationOfficialActivityData.sndFilePath = res.data.data.sndFilePath;
                     that.OpInvitationOfficialActivityData.fax = res.data.data.fax;
                     that.OpInvitationOfficialActivityData.createUserId = res.data.data.createUserId;
-                    that.OpInvitationOfficialActivityData.remark = res.data.data.remark;
-                    console.log(JSON.parse(res.data.data.sndFileName));
-                    var sndFileNamejson=JSON.parse(res.data.data.sndFileName)
+                    that.OpInvitationOfficialActivityData.remark = res.data.data.remark; 
+                    var sndFileNamejson=res.data.data.sndFileNameJsonStr;
                     for (let h = 0; h < res.data.data.sndFilePathItem.length; h++) {
                         that.fileList.push({url:res.data.data.sndFilePathItem[h],name:sndFileNamejson[h]})
                     }
+                    console.log(that.fileList);
                     if (that.OpInvitationOfficialActivityData.filePath != null && that.OpInvitationOfficialActivityData.filePath != undefined && that.OpInvitationOfficialActivityData.filePath != "") {
                         that.uploadFiles.push({
                             name: that.OpInvitationOfficialActivityData.sndFilePath,