Browse Source

2022-11-17 16:00

codeMan 2 years ago
parent
commit
e25e1273d5

+ 2 - 1
src/HDrpManagement/ProductGroupMag/modules/details.vue

@@ -10,7 +10,8 @@
         idname="sa_itemgroupid"
         :tabs="['商品明细']"
         @pageChange="pageChange"
-        @onEditSuccess="queryMainData($route.query.id)">
+        @onEditSuccess="queryMainData($route.query.id)"
+        :statusCheck="[{key:'isonsale',value:1}]">
       <div slot="customOperation">
         <Edit class="inline-16" :data="mainData" @onSuccess="queryMainData" :disabled="mainData.isonsale"/>
         <shelves class="inline-16" @upSuccess="queryMainData" :data="mainData"></shelves>

+ 7 - 4
src/HManagement/archives_ad/archives_adclass/index.vue

@@ -2,7 +2,7 @@
     <div>
         <list ref="list">
             <Header slot="add" v-if="tool.checkAuth($route.name, 'insert')">
-                <el-button icon="el-icon-plus" type="primary" size="small" @click="openDialog('新增分类')">新建分类</el-button>
+                <el-button icon="el-icon-plus" type="primary" size="small" @click="openDialog('新增分类')" style="margin-bottom:10px">新建分类</el-button>
             </Header>
 
             <template v-slot:release="scope">
@@ -23,7 +23,7 @@
             </template>
         </list>
 
-        <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible">
+        <el-dialog :title="dialogTitle" append-to-body :visible.sync="dialogFormVisible" width="40%">
 
             <el-form :model="form">
                 <el-form-item label="分类名称:" :label-width="'120px'">
@@ -32,8 +32,8 @@
             </el-form>
 
             <div slot="footer" class="dialog-footer">
-                <el-button @click="dialogFormVisible = false">取 消</el-button>
-                <el-button type="warning" @click="handleRequest">确 定</el-button>
+                <el-button @click="dialogFormVisible = false" size="small">取 消</el-button>
+                <el-button type="primary" size="small" @click="handleRequest">确 定</el-button>
             </div>
 
         </el-dialog>
@@ -105,4 +105,7 @@ export default {
 /deep/.header .left .el-button .el-icon-plus {
     margin-left: -6px;
 }
+/deep/.el-dialog__body{
+    padding-bottom: 0;
+}
 </style>

+ 4 - 0
src/HManagement/archives_ad/archives_adclass/modules/list.vue

@@ -9,6 +9,10 @@
                         <div v-if="scope.column.columnname == 'isenable'">
                             <slot name="release" :data="scope"></slot>
                         </div>
+                        <div v-else-if="scope.column.columnname == 'classname'">
+                            <span style="margin-right:10px">{{scope.column.data[scope.column.columnname]}}</span>
+                            <el-tag size="mini" v-if="scope.column.data.issystem == 1">系统</el-tag>
+                        </div>
                         <p v-else>{{ scope.column.data[scope.column.columnname] }}</p>
                     </template>
 

+ 4 - 2
src/HManagement/archives_ad/index.vue

@@ -32,9 +32,9 @@
       <template v-slot:tbOpreation="scope">
         <el-button class="inline-16" type="text" size="mini" @click="openDetail(scope.data.data)">详 情</el-button>
         <release :data="scope.data.data" @onSuccess="$refs.basicLayout.listData()" />
-        <el-button v-if="tool.checkAuth($route.name,'update')" type="text" size="mini" @click="EditBtn(scope.data.data)">编 辑</el-button>
+        <el-button v-if="tool.checkAuth($route.name,'update')" type="text" size="mini" :disabled="scope.data.data.status == '发布' || scope.data.data.status == '审核'" @click="EditBtn(scope.data.data)">编 辑</el-button>
         <el-button v-if="tool.checkAuth($route.name,'data_analysis')" type="text" class="inline-16" size="mini" @click="dataCalc(scope.data.data)">数 据 统 计</el-button>
-        <on-del v-if="tool.checkAuth($route.name,'delete')" :data="scope.data.data" @onSuccess="$refs.basicLayout.listData()" />
+        <on-del v-if="tool.checkAuth($route.name,'delete')" :disabled="scope.data.data.status == '发布' || scope.data.data.status == '审核'" :data="scope.data.data" @onSuccess="$refs.basicLayout.listData()" />
       </template>
     </basicLayout>
     <detail ref="detail" v-if="currentFile && tool.checkAuth($route.name, 'read')" :currentSelectFile="currentFile">
@@ -100,6 +100,8 @@ export default {
     },
     /* 新建的数据批量删除 */
     listData (data) {
+      console.log(data);
+      
       let initID = '9999' + JSON.parse(window.sessionStorage.getItem("active_account")).userid;
       let deleteList = [];
       data.forEach(v => (initID == v.sat_sharematerial_classid && v.title == '') ? deleteList.push(v.sat_sharematerialid) : '');

+ 3 - 3
src/HManagement/archives_ad/modules/delete.vue

@@ -1,12 +1,12 @@
 <template>
   <div style="display:inline">
-    <el-button slot="reference" size="small" type="text" @click="open">删除</el-button>
+    <el-button slot="reference" size="small" type="text" :disabled="disabled" @click="open">删 除</el-button>
   </div>
 </template>
 
 <script>
 export default {
-  props: ['data'],
+  props: ['data','disabled'],
   methods: {
 
     open() {
@@ -21,7 +21,7 @@ export default {
       this.$api.requested({
         "id": 20221102143602,
         "content": {
-          "sat_sharematerialid": [this.data.sat_sharematerialid]
+          "sat_sharematerialids": [this.data.sat_sharematerialid]
         }
       }).then(res => {
         this.tool.showMessage(res)

+ 1 - 1
src/HManagement/archives_sc/list/modules/details.vue

@@ -64,7 +64,7 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item label="封面" prop="cover">
-                    <previewImage v-if="form.cover" style="width:386px" :image="image" :deletebtn="true"
+                    <previewImage v-if="form.cover" style="width:386px" :image="image" :deletebtn="!edit"
                       @onSuccess="clearCover"></previewImage>
                     <upload v-else btntype="limage" :folderid="folderid" accept=".JPG,.PNG" :bindData="{ownertable:'SAT_COURSEWARE',ownerid:form.sat_coursewareid,usetype:'cover'}" @onSuccess="onCoverSubmit"></upload>
                     <p class="info">注:建议上传图片大小210*120px像素,大小不超过2M,格式为JPG/PNG</p>

+ 0 - 1
src/HManagement/notice/list/modules/add_notice.vue

@@ -99,7 +99,6 @@
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" type="primary" @click="emitNotice" plain class="normal-btn-width" :disabled="!current_sat_noticeid">发 布 通 告</el-button>
-        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width">保 存</el-button>
       </div>
   </div>

+ 1 - 0
src/SManagement/archives_upload/index.vue

@@ -34,6 +34,7 @@
           style="margin-left:10px;"
           :defaultData="defaultData"
           :dataid="authId"
+          :disabled="false"
           obiectName="sat_sharematerialid"
           @onChecked="onChecked"
         />