2023-3-7

src/HDrpManagement/recvoucher/components/writeoffBill.vue

@@ -36,7 +36,7 @@
           <p v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] !== 0 && scope.column.columnname != 'operation'&& scope.column.columnname != 'reason'">--</p>
         </template>
         <template v-slot:opreation="scope">
-          <!-- <el-button @click="goDetail(scope)" size="mini" type="text">详 情</el-button> -->
+          <el-button @click="goDetail(scope)" size="mini" type="text">详 情</el-button>
         </template>
       </tableLayout>
     </div>
@@ -89,7 +89,7 @@ export default {
         this.oldRoute = {path:route.path,query:route.query}
         this.$store.dispatch('setHistoryRouter',this.oldRoute)
       }
-      this.$router.replace({path:'/workorderDetail',query:{id:scope.data.sa_workorderid,rowindex:scope.data.rowindex}})
+      this.$router.replace({path:'/writeoffbillDetail',query:{id:scope.data.sa_writeoffbillid,rowindex:scope.data.rowindex}})
     },
     async listData(){
       this.params.content.sa_cashbillid = this.$route.query.id

src/HDrpManagement/recvoucher/details/index.vue

@@ -27,7 +27,7 @@
           idName="20230224183304"
           keyName="sa_cashbillid"
           :id="$route.query.id"
-          @onSuccess="queryMainData($route.query.id);$refs.bill && $refs.bill.listData()"
+          @onSuccess="writeOffSuccess"
           class="inline-16"
           v-if="mainData.status == '审核' && tool.checkAuth($route.name,'writeoff') && mainData.unwriteoffamount > 0"
         />
@@ -78,6 +78,17 @@ export default {
     }
   },
   methods:{
+    writeOffSuccess (data) {
+       this.queryMainData(this.$route.query.id)
+       this.$refs.bill && this.$refs.bill.listData()
+
+      let route = this.$route
+      if (route.path !== '/taskDetails') {
+        this.oldRoute = {path:route.path,query:route.query}
+        this.$store.dispatch('setHistoryRouter',this.oldRoute)
+      }
+      this.$router.replace({path:'/writeoffbillDetail',query:{id:data[0].sa_writeoffbillid,rowindex:data[0].rowindex}})
+    },
     async queryMainData(id){
       const res = await this.$api.requested({
         "id": "20221009103003",
@@ -148,6 +159,10 @@ export default {
           label:'凭证来源说明',
           value:this.mainData.sourcenote
         },
+        {
+          label:'对冲单号',
+          value:this.mainData.billno
+        },
         {
           label:'备注',
           value:this.mainData.remarks

src/HManagement/notice/list/modules/add.vue

@@ -21,7 +21,7 @@ export default {
         "content": "",
         "issecret": 1,
         "begdate":(new Date()).toLocaleDateString(),
-        "enddate":(new Date()).toLocaleDateString(),
+        "enddate":'',
         "isontop":0
       }
     }

src/HManagement/notice/list/modules/add_notice.vue

@@ -168,7 +168,8 @@ export default {
         "sat_submiteditmodelid": "0",
         "begdate": "",
         "enddate": "",
-        "issecret": false
+        "issecret": false,
+        "sat_notice_classid":''
       },
       defaultData: {},
       image: {},
@@ -241,6 +242,7 @@ export default {
         }
       })
       this.form = Object.assign({}, this.form, res.data)
+      this.form.sat_notice_classid = ''
       this.form.status !== '新建'?this.$store.dispatch('pageOnlyRead',true):this.$store.dispatch('pageOnlyRead',false)
       this.queryFileLink()
       this.queryNoticeClass()

src/SDrpManagement/invoiceapp_saler/index.vue

@@ -40,7 +40,10 @@
         </div>
       </template>
       <template v-slot:tbList="scope">
-        <div v-if="scope.data.column.columnname == 'status'">
+        <div v-if="scope.data.column.columnname == 'suminvoiceamount'">
+          <span>{{tool.formatAmount(scope.data.column.data.suminvoiceamount,2)}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'status'">
           <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#d90a0a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
@@ -48,9 +51,6 @@
         <div v-else-if="scope.data.column.columnname == 'byhand'">
           <span>{{scope.data.column.data.byhand == 1?'手工':'线上'}}</span>
         </div>
-        <div v-else-if="scope.data.column.columnname == 'suminvoiceamount'">
-          <span>{{this.tool.formatAmount(scope.data.column.data.suminvoiceamount,2)}}</span>
-        </div>
         
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}

src/SManagement/notice/notice_detail/NoticeDetail.vue

@@ -122,6 +122,8 @@ export default {
       
       this.detailData.attinfos = this.fileType.fileList(this.detailData.attinfos)
       this.detailData.content != '<p><br></p>' ? this.compileFWB() : ''
+      console.log(this.detailData);
+      
     },
     //发表
     async sendComment () { 

src/components/customBtn/index.vue

@@ -52,7 +52,7 @@ export default {
           param.content[this.dialogKey] = value
           let res = await this.$api.requested(param)
           this.tool.showMessage(res,() => {
-            this.$emit('onSuccess')
+            this.$emit('onSuccess',res.data)
           })
         })
       } else {
@@ -71,7 +71,7 @@ export default {
           })
           let res = await this.$api.requested(param)
           this.tool.showMessage(res,() => {
-            this.$emit('onSuccess')
+            this.$emit('onSuccess',res.data)
           })
         })
       }

src/store/index.js

@@ -48,7 +48,7 @@ export default new Vuex.Store({
     sys_modules:state => state.sys_modules,
     historyRouter:state => state.historyRouter,
     isRouterAlive:state => state.isRouterAlive,
-    pageCache: status => status.pageCache
+    pageCache: state => state.pageCache
     
   },
   mutations: {

src/views/message/components/list.vue

@@ -6,7 +6,7 @@
           <p class="title">{{item.title}}</p>
           <p class="message">{{item.message}}</p>
           <div class="info">
-            <div class="tag">{{item.name || '系统消息'}}</div>
+            <div class="tag">{{`${item.type}消息`}}</div>
             <p class="time">{{item.createdate}}</p>
           </div>
         </div>

src/views/message/index.vue

@@ -84,6 +84,8 @@ export default {
           this.isCategory(item)
         })
       }
+      console.log(this.list);
+      
       if(this.list[0]) this.messageItemClick(this.list[0])
       this.total = res.total
     },