2022-11-16 17:00

src/Form/tagManage/add.vue

@@ -6,7 +6,7 @@
         新增标签
       </div>
       <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="left" size="mini">
+        <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
           <el-col :span="24">
             <el-form-item label="新增标签" prop="tag">
               <el-input v-model="form.tag" placeholder="请输入标签名"></el-input>

src/HDrpManagement/ProductGroupMag/modules/addGroupDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <add-btn ref="add" :rowData="rowData" v-if="tool.checkAuth($route.name,'insert')" @onSuccess="getDetail" style="margin-bottom:16px" />
+    <add-btn ref="add" :rowData="rowData" v-if="tool.checkAuth($route.name,'insert')" :disabled="disabled" @onSuccess="getDetail" style="margin-bottom:16px" />
     <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" height="40vh" fixedName="operation">
       <template v-slot:customcol="scope">
           <span v-if="scope.column.data[scope.column.columnname]">{{scope.column.data[scope.column.columnname]}}</span>
@@ -57,7 +57,7 @@ export default {
       total:0
     }
   },
-  props:['rowData'],
+  props:['rowData','disabled'],
   components:{AddBtn,Del,editBtn},
 
   watch: {

src/HDrpManagement/ProductGroupMag/modules/addGroupDetailBtn.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="primary" size="mini" @click="editBtn">新 增 商 品 明 细</el-button>
+    <el-button type="primary" size="mini" :disabled="!!disabled" @click="editBtn">新 增 商 品 明 细</el-button>
     <el-drawer title="新增商品明细" :visible.sync="drawer" size="50%" direction="rtl" append-to-body>
       <div class="drawer__panel">
           <el-row>
@@ -50,7 +50,7 @@
 <script>
 import Table from './table'
 export default {
-  props: ['data', 'type','rowData'],
+  props: ['data', 'type','rowData','disabled'],
   components:{Table},
   data () {
     return {
@@ -90,6 +90,11 @@ export default {
       }
     }
   },
+  watch: {
+    drawer (val) {
+      !val ? this.$refs.table.$refs.tables.clearSelection() : ''
+    }
+  },
   inject:['brandList'],
   created () {
     this.tablecols = this.tool.tabelCol(this.$route.name)['addProductTable'].tablecols
@@ -140,6 +145,7 @@ export default {
           this.tool.showMessage(res, () => {
             this.$emit('onSuccess')
             this.$refs.form.resetFields()
+            this.$refs.table.$refs.tables.clearSelection()
             this.$refs.table.allArr = []
             this.drawer = false
           })

src/HDrpManagement/ProductGroupMag/modules/details.vue

@@ -3,9 +3,6 @@
     <basicDetails
         ref="details"
         :titleText="mainData.groupname"
-        :oldFormPath="{
-          edit:'HDrpManagement/ProductGroupMag/modules',
-        }"
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20220922164403"
@@ -15,6 +12,7 @@
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation">
+        <Edit class="inline-16" :data="mainData" @onSuccess="queryMainData" :disabled="mainData.isonsale"/>
         <shelves class="inline-16" @upSuccess="queryMainData" :data="mainData"></shelves>
 <!--        <el-popover placement="bottom" style="20px">
           <Up type="one" @upSuccess="queryMainData" ":id="[mainData.sa_itemgroupid] v-if="mainData.isonsale == 0 && tool.checkAuth($route.name,'up_sales')"></Up>
@@ -23,7 +21,7 @@
         </el-popover>-->
       </div>
       <div slot="slot0" class="container normal-panel">
-        <addGroupDetail v-if="mainData" :rowData="mainData"/>
+        <addGroupDetail :disabled="mainData.isonsale" v-if="mainData" :rowData="mainData"/>
       </div>
     </basicDetails>
   </div>
@@ -34,6 +32,7 @@ import addGroupDetail from './addGroupDetail'
 import Up from './up'
 import Down from './down'
 import shelves from '../components/shelves'
+import Edit from './edit'
 export default {
   name: "detail",
   data() {
@@ -47,7 +46,8 @@ export default {
     addGroupDetail,
     Up,
     Down,
-    shelves
+    shelves,
+    Edit
   },
   methods:{
     async queryMainData(id) {

src/HDrpManagement/ProductGroupMag/modules/edit.vue

@@ -1,16 +1,15 @@
 <template>
   <div >
-    <el-button size="mini" @click="editBtn">编 辑</el-button>
-    <el-drawer title="编辑商品组" :visible.sync="dialogTableVisible" size="40%" direction="rtl" append-to-body>
-      <div class="drawer__panel">
+    <el-button size="mini" @click="editBtn" :disabled="!!disabled">编 辑</el-button>
+    <el-dialog title="编辑商品组" :visible.sync="dialogTableVisible" width="30%" direction="rtl" append-to-body>
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules"  ref="form"  size="small" label-position="right" label-width="100px">
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="商品组名称:" prop="groupname">
                 <el-input v-model="form.groupname" placeholder="请输入商品组名称"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="品牌:" prop="sa_brandid">
                 <el-select v-model="form.sa_brandid" placeholder="请选择品牌" @change="getProductList(params.content.pageNumber = 1,$refs.table.allArr=[])" style="width: 100%">
                   <el-option v-for="item in brandList()" :key="item.sa_brandid" :label="item.brandname"
@@ -19,7 +18,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="24" style="margin-bottom: 20px;margin-top: 22px">
+            <!-- <el-col :span="24" style="margin-bottom: 20px;margin-top: 22px">
               <label class="inline-16" style="font-size: 14px">可选商品:</label>
               <el-input placeholder="请输入搜索内容" suffix-icon="el-icon-search" v-model="search" @keyup.native.enter="queryClick" @clear="clearData()" style="width:260px;float: right" size="small" class="input-with-select inline-16" clearable>
               </el-input>
@@ -40,15 +39,14 @@
                     :total="total">
                 </el-pagination>
               </div>
-            </el-col>
+            </el-col> -->
           </el-form>
         </el-row>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogTableVisible = false">取 消</el-button>
+        <el-button type="primary" size="small" @click="submit">确 定</el-button>
       </div>
-      <div class="fixed__btn__panel">
-        <el-button size="small" @click="dialogTableVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="primary" @click="submit" class="normal-btn-width">确 定</el-button>
-      </div>
-    </el-drawer>
+    </el-dialog>
   </div>
 </template>
 
@@ -99,7 +97,7 @@ export default {
       }
     }
   },
-  props:['data'],
+  props:['data','disabled'],
   inject:['productList','brandList'],
   watch: {
     

src/SManagement/sales_forecast/modules/modelDetail.vue

@@ -77,7 +77,7 @@ export default {
     closeDrawer () {
       this.$router.replace({path:this.$route.path})
     },
-    async queryMainData(id) {
+    async queryMainData() {
       const res = await this.$api.requested({
         "id":20220906154603,
         "content": {
@@ -180,7 +180,9 @@ export default {
     },
   },
   mounted () {
-    this.queryMainData(this.$route.query.id)
+    setTimeout(() => {
+      this.queryMainData()
+    })
   },
   created() {
   }

src/SManagement/sales_forecast/modules/projectDetail.vue

@@ -86,7 +86,7 @@ export default {
   created() {
     this.getDetail()
     this.getSubmitList()
-    this.tablecols = this.tool.tabelCol(this.$route.name).salesEditTable.tablecols.splice(0,8)
+    this.tablecols = this.tool.tabelCol(this.$route.name).salesEditTable.tablecols
   },
   methods: {
     /* 获取头部详情 */

src/SManagement/sales_forecast/modules/salesHistory.vue

@@ -112,10 +112,10 @@ export default {
     },
   },
   mounted () {
+    this.listData()
     this.tablecols = this.tool.tabelCol(this.$route.name)['salesHistoryTable'].tablecols
   },
   created () {
-    this.listData()
   }
 }