dedsudiyu 11 months ago
parent
commit
747748a769

+ 0 - 1
src/views/chemicalManage/earlyWarningEvent/index.vue

@@ -113,7 +113,6 @@
   import infoPage from "./infoPage.vue";
   import infoPage from "./infoPage.vue";
   import { getDeptDropList,systemBuildingGetTreeList,} from "@/api/commonality/permission";
   import { getDeptDropList,systemBuildingGetTreeList,} from "@/api/commonality/permission";
   import {
   import {
-    chemicalUserecordDetail,
     systemWarningNoticeDetail,
     systemWarningNoticeDetail,
     systemWarningNoticeList,
     systemWarningNoticeList,
     systemWarningNoticeWarningDetail, systemWarningNoticeWarningList
     systemWarningNoticeWarningDetail, systemWarningNoticeWarningList

+ 1 - 2
src/views/chemicalManage/inventoryManagement/inventoryStatistics/inventoryList.vue

@@ -161,8 +161,7 @@
   import {
   import {
     chemicalCabinetList,
     chemicalCabinetList,
     chemicalStockStockDetails,
     chemicalStockStockDetails,
-    chemicalStockStockDetailsList,
-    chemicalUserecordDetail
+    chemicalStockStockDetailsList
   } from '@/api/chemicalManage'
   } from '@/api/chemicalManage'
   import { getDicts } from '@/api/commonality/noPermission'
   import { getDicts } from '@/api/commonality/noPermission'
   export default {
   export default {

+ 1 - 1
src/views/chemicalManage/useLedger/index.vue

@@ -316,7 +316,7 @@
         let self = this;
         let self = this;
         if(type == 2){
         if(type == 2){
           //详情
           //详情
-          chemicalUserecordDetail({stockId:row.stockId}).then(response => {
+          chemicalUserecordDetail({stockDetailsId:row.stockDetailsId}).then(response => {
             this.$set(this.propsData,'dataList',JSON.parse(JSON.stringify(response.data)));
             this.$set(this.propsData,'dataList',JSON.parse(JSON.stringify(response.data)));
             this.$set(this.propsData,'chemicalDetail',row);
             this.$set(this.propsData,'chemicalDetail',row);
             this.$set(this,'pageType',2);
             this.$set(this,'pageType',2);

+ 6 - 2
src/views/integratedManagement/messageNotice/notice/addPage.vue

@@ -171,11 +171,15 @@
             let obj = {
             let obj = {
               title:this.addForm.title,
               title:this.addForm.title,
               noticeType:this.addForm.noticeType,
               noticeType:this.addForm.noticeType,
-              sendType:this.addForm.sendType,
-              userIds:this.addForm.sendType == 5 ? this.addForm.userIds : [],
               sendState:this.addForm.sendState,
               sendState:this.addForm.sendState,
               content:this.$refs.UEditor.text||"",
               content:this.$refs.UEditor.text||"",
             }
             }
+            if(obj.noticeType == 1){
+              obj.sendType = this.addForm.sendType;
+              obj.userIds = this.addForm.sendType == 5 ? this.addForm.userIds : [];
+            }else{
+              obj.company = this.addForm.company;
+            }
             if (this.addForm.noticeId){
             if (this.addForm.noticeId){
               obj.noticeId = this.addForm.noticeId;
               obj.noticeId = this.addForm.noticeId;
               systemNoticeUpdate(obj).then(response => {
               systemNoticeUpdate(obj).then(response => {

+ 0 - 1
src/views/integratedManagement/messageNotice/warningNotice/index.vue

@@ -125,7 +125,6 @@
   import forewarningConfig from "./forewarningConfig.vue"
   import forewarningConfig from "./forewarningConfig.vue"
   import { getDeptDropList,systemBuildingGetTreeList,} from "@/api/commonality/permission";
   import { getDeptDropList,systemBuildingGetTreeList,} from "@/api/commonality/permission";
   import {
   import {
-    chemicalUserecordDetail,
     systemWarningNoticeDetail,
     systemWarningNoticeDetail,
     systemWarningNoticeList, systemWarningNoticeWarningDetail,
     systemWarningNoticeList, systemWarningNoticeWarningDetail,
     systemWarningNoticeWarningList
     systemWarningNoticeWarningList