Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue

src/components/Drawer/src/BasicDrawer.vue

@@ -212,6 +212,7 @@
       height: calc(100% - @header-height);
       padding: 0;
       background-color: @component-background;
+      background: url(../resource/img/modalback.png);
 
       .scrollbar__wrap {
         padding: 16px !important;

src/layouts/default/header/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <Header :class="getHeaderClass" style="background-image: url('../resource/img/bj.png');background-repeat: no-repeat;background-size: 100% auto;">
+  <Header :class="getHeaderClass" style="background-image: url('../resource/img/bj.png')  !important;background-repeat: no-repeat;background-size: 100% auto;">
     <!-- left start -->
     <div :class="`${prefixCls}-left`">
       <!-- logo -->

src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue

@@ -343,17 +343,39 @@ const getCardStyle = (index,allSize) => {
       {
         label: '详情',
         onClick: handleDetail.bind(null, record),
-      }, {
-        label: '删除',
-        popConfirm: {
-          title: '是否确认删除',
-          confirm: handleDelete.bind(null, record),
-          placement: 'topLeft',
-        },
-        auth: 'configMaterialInfo:config_material_info:delete'
-      }
+      }, 
+      // {
+      //   label: '删除',
+      //   popConfirm: {
+      //     title: '是否确认删除',
+      //     confirm: handleDelete.bind(null, record),
+      //     placement: 'topLeft',
+      //   },
+      //   auth: 'configMaterialInfo:config_material_info:delete'
+      // }
+      {
+        label: '启用',
+        onClick: handleWlQyty.bind(null, record),
+        ifShow: record.izEnabled == 1
+      }, 
+      {
+        label: '停用',
+        onClick: handleWlQyty.bind(null, record),
+        ifShow: record.izEnabled == 0
+      }, 
+
     ];
   }
+
+//物料的启用停用
+  function handleWlQyty(record){
+    console.log("🚀 ~ handleWlQyty ~ record:", record)
+    const izEnabled = record.izEnabled == '1' ? '0' : "1"
+    var params = {id:record.id,izEnabled}
+    defHttp.post({ url: '/invoicing/configMaterialInfo/edit', params }).then((res) => { 
+      searchQuery()
+    });
+  }
    
    //点击树节点查询右侧列表数据
    function handleSearch(data){

src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfo.data.ts

@@ -41,16 +41,22 @@ export const columns: BasicColumn[] = [
     dataIndex: 'openingBank'
    },
    {
-    title: '开户行账号',
-    align:"center",
-    dataIndex: 'openingBankNo'
-   },
-   {
-    title: '微信账号',
-    align:"center",
-    dataIndex: 'wechartId'
+     title: '是否启用',
+     align: "center",
+     dataIndex: 'izEnabled_dictText',
+     width:'100px'
    },
   //  {
+  //   title: '开户行账号',
+  //   align:"center",
+  //   dataIndex: 'openingBankNo'
+  //  },
+  //  {
+  //   title: '微信账号',
+  //   align:"center",
+  //   dataIndex: 'wechartId'
+  //  },
+  //  {
   //   title: '资质照片',
   //   align:"center",
   //   dataIndex: 'imgPath',

src/views/invoicing/configSuppliersInfo/ConfigSuppliersInfoList.vue

@@ -70,6 +70,7 @@
   import { useDrawer } from '/@/components/Drawer';
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import JInput from '/@/components/Form/src/jeecg/components/JInput.vue';
+  import { defHttp } from '/@/utils/http/axios';
   const queryParam = reactive<any>({});
   const checkedKeys = ref<Array<string | number>>([]);
   const userStore = useUserStore();
@@ -207,17 +208,37 @@ const labelCol = reactive({
          {
            label: '详情',
            onClick: handleDetail.bind(null, record),
-         }, {
-           label: '删除',
-           popConfirm: {
-             title: '是否确认删除',
-             confirm: handleDelete.bind(null, record),
-             placement: 'topLeft',
-           },
-           auth: 'configSuppliersInfo:config_suppliers_info:delete'
-         }
+         }, 
+        //  {
+        //    label: '删除',
+        //    popConfirm: {
+        //      title: '是否确认删除',
+        //      confirm: handleDelete.bind(null, record),
+        //      placement: 'topLeft',
+        //    },
+        //    auth: 'configSuppliersInfo:config_suppliers_info:delete'
+        //  }
+      {
+        label: '启用',
+        onClick: handleWlQyty.bind(null, record),
+        ifShow: record.izEnabled == 1
+      }, 
+      {
+        label: '停用',
+        onClick: handleWlQyty.bind(null, record),
+        ifShow: record.izEnabled == 0
+      }, 
        ]
    }
+//物料的启用停用
+  function handleWlQyty(record){
+    console.log("🚀 ~ handleWlQyty ~ record:", record)
+    const izEnabled = record.izEnabled == '1' ? '0' : "1"
+    var params = {id:record.id,izEnabled}
+    defHttp.post({ url: '/invoicing/configSuppliersInfo/edit', params }).then((res) => { 
+      searchQuery()
+    });
+  }
      /**
         * 下拉操作栏
         */

src/views/services/directivePackage/components/PackageList.vue

@@ -325,12 +325,13 @@ defineExpose({
 }
 
 .ant-drawer .ant-drawer-body {
-  flex: 1;
+  flex: 111;
   min-width: 0;
   min-height: 0;
   padding: 24px;
   overflow: auto;
   background: #dfdfdf;
+  background: url(../public/resource/img/modalback.png);
 }
 
 .selected {

src/views/services/serviceDirective/ConfigServiceDirectiveList.vue

@@ -220,7 +220,7 @@
     <template #footer>
       <a-button type="primary" @click="onBodyTagClose" style="float: right;">关闭</a-button>
     </template>
-    <BodyTagList v-if="bodyTagOpen"></BodyTagList>
+    <BodyTagList v-if="bodyTagOpen" class="backClass"></BodyTagList>
   </a-drawer>
 
   <!-- 情绪标签 -->
@@ -228,13 +228,13 @@
     <template #footer>
       <a-button type="primary" @click="onEmotionTagClose" style="float: right;">关闭</a-button>
     </template>
-    <EmotionTagList v-if="emotionTagOpen"></EmotionTagList>
+    <EmotionTagList v-if="emotionTagOpen" class="backClass"></EmotionTagList>
   </a-drawer>
 
   <!-- 音频播放 -->
   <a-modal v-model:visible="showAudioModal" title="音频播放" :footer="null" @cancel="closeAudioModal"
     :bodyStyle="{ padding: '0', maxHeight: '80vh', overflow: 'auto' }" :keyboard="true">
-    <audio controls style="width: 100%; display: block; margin: 20px auto;">
+    <audio ref="audioPlayer" controls style="width: 100%; display: block; margin: 20px auto;">
       <source :src="audioUrl">
       您的浏览器不支持音频播放。
     </audio>
@@ -243,7 +243,7 @@
   <!-- 视频播放 -->
   <a-modal v-model:visible="showVideoModal" title="视频播放" :footer="null" @cancel="closeVideoModal"
     :bodyStyle="{ padding: '0', maxHeight: '80vh', overflow: 'auto' }">
-    <video controls style="width: 100%; max-height: 70vh; display: block; margin: 0 auto;">
+    <video  ref="videoPlayer" controls style="width: 100%; max-height: 70vh; display: block; margin: 0 auto;">
       <source :src="videoUrl">
       您的浏览器不支持视频播放。
     </video>
@@ -589,6 +589,7 @@ function onEmotionTagClose() {
 
 const showAudioModal = ref(false); // 控制音频模态框显示
 const audioUrl = ref(''); // 音频 URL
+const audioPlayer = ref(null);
 
 // 打开音频模态框
 const openAudioModal = (url) => {
@@ -598,12 +599,17 @@ const openAudioModal = (url) => {
 
 // 关闭音频模态框
 const closeAudioModal = () => {
+  if (audioPlayer.value) {
+    audioPlayer.value.pause(); // 暂停音频播放
+    audioPlayer.value.currentTime = 0; // 可选：重置播放进度
+  }
   showAudioModal.value = false;
   audioUrl.value = '';
 };
 
 const showVideoModal = ref(false); // 控制模态框显示
 const videoUrl = ref(''); // 视频 URL
+const videoPlayer = ref(null);
 
 // 打开视频模态框
 const openVideoModal = (url) => {
@@ -613,12 +619,15 @@ const openVideoModal = (url) => {
 
 // 关闭视频模态框
 const closeVideoModal = () => {
+  if (videoPlayer.value) {
+    videoPlayer.value.pause(); // 暂停视频播放
+    videoPlayer.value.currentTime = 0; // 可选：将播放进度重置到开始
+  }
   showVideoModal.value = false;
   videoUrl.value = '';
 };
 
 // 添加以下响应式变量
-const audioPlayer = ref<HTMLAudioElement | null>(null);
 const currentPlayingAudio = ref<string | null>(null);
 const isPlaying = ref(false);
 
@@ -1063,4 +1072,8 @@ audio::-webkit-media-controls-time-remaining-display {
     overflow-y: auto;
   }
 }
+.backClass{
+  
+      background: url(../../resource/img/modalback.png);
+}
 </style>