zhangqi 1 year ago
parent
commit
8b6735897d

+ 1 - 1
src/DRP/HDrpManagement/calcMethod/modules/Edit.vue

@@ -3,7 +3,7 @@
   <a-drawer
     v-model:open="visible"
     class="custom-class"
-    title="编辑费用制方案"
+    title="编辑费用制方案"
     placement="right"
     width="600"
     :closable="false"

+ 16 - 3
src/DRP/HDrpManagement/dispatchMxList/index.vue

@@ -26,10 +26,8 @@
   import utils from '@/utils/utils'
   import Api from '@/api/api'
   import listTemp from '@/components/listTemplate/index.vue';
-  import tableExport from '@/components/tableExport/index.vue'
-  import { ref } from 'vue'
+  import { ref ,onMounted} from 'vue'
   import { useRouter } from "vue-router";
-  import { onMounted } from "vue";
   import { useBaseStore } from '@/stores/modules/base'
   import { storeToRefs } from 'pinia'
   const base = useBaseStore()
@@ -63,6 +61,21 @@
   const onSuccess = ()=>{
     list.value.tableData()
   }
+  const saleClass = async ()=>{
+    const res = await Api.requested({
+      id:'20220922110403',
+      content:{
+        sa_brandid:0,
+        where:{
+          istool:0
+        }
+      }
+    })
+    searchType.value.push({label:'营销分类',key:'itemclassid',type:'treeselect',dataSource:res.data[0].ttemclass},)
+  }
+  onMounted(()=>{
+    saleClass()
+  })
 </script>
 <style>
 </style>

+ 4 - 0
src/DRP/HDrpManagement/productGroupManage/modules/add.vue

@@ -90,6 +90,10 @@ const getBrand = async ()=>{
     }
   })
   brandsOptions.value = res_brand.data
+
+  if (brandsOptions.value.length == 1) {
+    form.value.sa_brandid = brandsOptions.value[0].sa_brandid
+  }
 }
 const formRef = ref()
 const submit = async () => {

+ 2 - 2
src/DRP/HDrpManagement/promotionManage/modules/batchOperation.vue

@@ -24,7 +24,7 @@
     <template #extra>
       <a-space>
         <a-button @click="onClose">取消</a-button>
-        <a-button type="primary" @click="changeIsOnSale">确定</a-button>
+        <a-button type="primary" :disabled="selection.length == 0" @click="changeIsOnSale">确定</a-button>
       </a-space>
     </template>
   </a-drawer>
@@ -52,7 +52,7 @@ const list = ref()
 const onOpen = (val)=>{
   open.value = true
   nextTick(()=>{
-    // param.value.content.where = val
+    param.value.content.where = val
     list.value.listData()
   })
   

+ 4 - 0
src/DRP/HDrpManagement/returnedPurchase/modules/add.vue

@@ -180,6 +180,10 @@ const  returnCategory = async ()=> {
   reCategoryOptions.value = res.data
   res.data.length == 1 ? form.value.type = res.data[0].value:null
   reCategoryOptionsmx.value = res.data[0].subvalues
+
+  if (reCategoryOptionsmx.value.length == 1) {
+    form.value.typemx = reCategoryOptionsmx.value[0]
+  }
 }
 const reCategoryOptionsmx = ref([])
 const selectMx = (item)=>{

+ 7 - 0
src/DRP/SDrpManagement/order/modules/add.vue

@@ -144,7 +144,14 @@ const fieldAndbrand = async ()=>{
   res_fields.value = res_field.data
 
   fieldsOptions.value = res_agent_field.data.filter(item => res_field.data.some(obj => obj.value === item.tradefield));
+
+  if (fieldsOptions.value.length == 1) {
+    form.value.tradefield = fieldsOptions.value[0].tradefield
+    selectAccount(fieldsOptions.value[0])
+  }
   form.value.sa_brandid = res_brand.data[0].sa_brandid
+
+
   // form.value.tradefield = tradefield.length == 0 ? fieldsOptions.value[0].tradefield : null
 }
 const canUseAccount = ref([])

+ 1 - 1
src/template/normalTable/index.vue

@@ -44,7 +44,7 @@
       <template #headerCell="{ column }">
         <div style="width:100%" v-if="column.filter == 1 || column.filter == 2">
           <!-- <a-input v-model:value="column.value" :placeholder="column.title" @change="setSearchParam(column.dataIndex,column.value)" @pressEnter="listData"></a-input> -->
-          <a-input v-model:value="column.value" :placeholder="column.title" @change="setSearchParam(column.dataIndex,column.value)" @pressEnter="listData" :bordered="true">
+          <a-input v-model:value="column.value" :placeholder="column.title" @change="setSearchParam(column.dataIndex,column.value)" @pressEnter="listData()" :bordered="true">
             <template v-if="column.sortable == 1" #suffix>
               <sort-ascending-outlined v-if="column.sort == 0" @click="setSort(column,1)"/>
               <sort-descending-outlined v-else @click="setSort(column,0)"/>