代码上传

src/App.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="canPointer?'':'stop_pointer'">
+  <div :class="canPointer?'':'stop_pionet'">
     <a-config-provider :theme="{
       algorithm: theme[themeAlgorithm],
     }" :csp="{ nonce: 'YourNonceCode' }" component-shape="round" :locale="zhCN">
@@ -7,7 +7,6 @@
       </router-view>
     </a-config-provider>
   </div>
-  
 </template>
 <script setup>
   import {ref,onMounted} from 'vue'
@@ -21,8 +20,8 @@
   const base = useBaseStore()
   let { themeAlgorithm, canPointer} = storeToRefs(base)
   dayjs.locale('zh')
-
   onMounted(()=>{
+
   })
 </script>
 
@@ -31,12 +30,7 @@
   height: 100%;
   width: 100%;
 }
-.stop_pointer{
-  position:fixed;
-  top:0;
-  left:0;
-  height:100vh;
-  width:100%;
+.stop_pionet{
   pointer-events: none;
 }
 

src/DRP/ARDrpManagement/dispatchmag/index.vue

@@ -29,7 +29,7 @@
   let dataSource = ref([])
   let searchType = ref([
     {label:'类型',key:'type',type:'select',dataSource:[{remarks:'发货',value:'发货'},{remarks:'退货',value:'退货'}]},
-    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'经销商信息',key:'agentinfo',type:'input'},
     {label:'商品信息',key:'iteminfo',type:'input'},
     {label:'搜索',key:'condition',type:'input'},

src/DRP/ARDrpManagement/logistics/index.vue

@@ -12,7 +12,7 @@
   import { useRouter } from "vue-router";
   const list = ref()
   let searchType = ref([
-    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'结算',value:'结算'},{remarks:'审核',value:'审核'}]},
     {label:'搜索',key:'condition',type:'input'},
   ])

src/DRP/ARDrpManagement/ordersaler/index.vue

@@ -25,7 +25,7 @@
   let searchType = ref([
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'预提交',value:'预提交'},{remarks:'确认',value:'确认'},{remarks:'提交',value:'提交'},{remarks:'审核',value:'审核'},{remarks:'关闭',value:'关闭'}]},
     {label:'订单类型',key:'type',type:'select',dataSource:[{remarks:'标准订单',value:'标准订单'},{remarks:'促销订单',value:'促销订单'},{remarks:'特殊订单',value:'特殊订单'}]},
-    {label:'下单日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'下单日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'搜索',key:'condition',type:'input'},
   ])
   let param = ref({

src/DRP/HDrpManagement/agentManage/detail/modules/edit.vue

@@ -54,7 +54,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="人员" name="saler_name">
+            <a-form-item label="人员" name="saler_name" :rules="[{ required: true, message: '请选择销管' }]">
               <a-input-search
                 v-model:value="form.saler_name"
                 placeholder="选择销管"

src/DRP/HDrpManagement/agentManage/modules/add.vue

@@ -54,7 +54,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="12">
-            <a-form-item label="销管" name="saler_name">
+            <a-form-item label="销管" name="saler_name" :rules="[{ required: true, message: '请选择销管' }]">
               <a-input-search
                 v-model:value="form.saler_name"
                 placeholder="选择销管"

src/DRP/HDrpManagement/collectionVoucher/index.vue

@@ -31,7 +31,7 @@
   let dataSource = ref([])
   let searchType = ref([
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'审核',value:'审核'}]},
-    {label:'单据日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'归属日期',key:'dateRange2',type:'datepickerRange',objKeys:['beginperiod','endperiod']},
     {label:'经销商信息',key:'agentinfo',type:'input'},
     {label:'搜索',key:'condition',type:'input'},

src/DRP/HDrpManagement/creditAdjustment/detail/index.vue

@@ -57,7 +57,6 @@ import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { useRouter } from "vue-router";
 import { onMounted,ref,createVNode } from "vue";
 const router = useRouter()
-
 const param = ref({
   "id": 20230104100903,
   "content": {

src/DRP/HDrpManagement/disbursementVoucher/index.vue

@@ -34,7 +34,7 @@
   let dataSource = ref([])
   let searchType = ref([
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'审核',value:'审核'}]},
-    {label:'单据日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'归属日期',key:'dateRange2',type:'datepickerRange',objKeys:['beginperiod','endperiod']},
     {label:'经销商信息',key:'agentinfo',type:'input'},
     {label:'搜索',key:'condition',type:'input'},

src/DRP/HDrpManagement/dispatchBill/index.vue

@@ -32,7 +32,7 @@
   let columns = ref([])
   let dataSource = ref([])
   let searchType = ref([
-    {label:'单据日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'复核',value:'复核'},{remarks:'关闭',value:'关闭'},{remarks:'手工关闭',value:'手工关闭'}]},
     {label:'经销商',key:'agentinfo',type:'input'},
     {label:'搜索',key:'condition',type:'input'},

src/DRP/HDrpManagement/dispatchMxList/index.vue

@@ -34,7 +34,7 @@
   let columns = ref([])
   let dataSource = ref([])
   let searchType = ref([
-    {label:'单据日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'复核',value:'复核'},{remarks:'关闭',value:'关闭'},{remarks:'手工关闭',value:'手工关闭'}]},
     {label:'已审未发',key:'isnotsent',type:'select',dataSource:[{remarks:'是',value:1},{remarks:'否',value:''}]},
     {label:'经销商信息',key:'agentinfo',type:'input'},

src/DRP/HDrpManagement/inventoryManage/modules/inventoryMx.vue

@@ -10,7 +10,7 @@
       :closable="false"
       @close="onClose"
     >
-    <normal-table ref="list" size="small" keyRow="itemid" :param="param" :noQuery="true" :columns="utils.TBLayout('storeDetailList')"></normal-table>
+    <normal-table size="small" keyRow="rowindex" :param="param" :columns="utils.TBLayout('storeDetailList')"></normal-table>
       <template #extra>
         <a-space>
           <a-button @click="onClose">关闭</a-button>

src/DRP/HDrpManagement/logisticsOrder/index.vue

@@ -24,7 +24,7 @@
   let columns = ref([])
   let dataSource = ref([])
   let searchType = ref([
-    {label:'单据日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'结算',value:'结算'},{remarks:'审核',value:'审核'}]},
     {label:'搜索',key:'condition',type:'input'},
   ])

src/DRP/HDrpManagement/orderManage/index.vue

@@ -41,10 +41,9 @@ export default {
   let searchType = ref([
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'预提交',value:'预提交'},{remarks:'确认',value:'确认'},{remarks:'提交',value:'提交'},{remarks:'审核',value:'审核'},{remarks:'关闭',value:'关闭'},{remarks:'手工关闭',value:'手工关闭'}]},
     {label:'订单类型',key:'type',type:'select',dataSource:[{remarks:'标准订单',value:'标准订单'},{remarks:'促销订单',value:'促销订单'},{remarks:'特殊订单',value:'特殊订单'}]},
-    {label:'单据日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'单据日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'提交日期',key:'dateRange1',type:'datepickerRange',objKeys:['begindate1','enddate1']},
     {label:'审核日期',key:'dateRange2',type:'datepickerRange',objKeys:['begindate2','enddate2']},
-    
     {label:'搜索',key:'condition',type:'input'},
   ])
   let param = ref({

src/DRP/HDrpManagement/orderManage/modules/add.vue

@@ -70,7 +70,6 @@
                 v-model:value="form.tradefield"
                 placeholder="选择领域"
                 style="width: 100%"
-
               >
                 <a-select-option :value="item.tradefield" v-for="item in tradefieldOptions" :key="item.index">{{item.tradefield}}</a-select-option>
               </a-select>

src/DRP/HDrpManagement/orderMxList/index.vue

@@ -39,7 +39,7 @@
   let columns = ref([])
   let dataSource = ref([])
   let searchType = ref([
-    {label:'单据日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'审核日期',key:'dateRange1',type:'datepickerRange',objKeys:['begindate2','enddate2']},
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'审核',value:'审核'},{remarks:'关闭',value:'关闭'},{remarks:'手工关闭',value:'手工关闭'}]},
     {label:'查看未发',key:'isuncheckout',type:'select',dataSource:[{remarks:'是',value:'1'},{remarks:'否',value:'0'}]},

src/DRP/HDrpManagement/promotionManage/detail/tabs/authAgent.vue

@@ -15,7 +15,7 @@
       </a-radio-group>
     </div>
   </div>
-  <normal-table ref="list" rowKey="sa_promotion_authid" :param="{id:20230102102903,content:{sa_promotionid:props.id,where:{condition:''}}}" size="small" :columns="utils.TBLayout('promotionModelPowerAreaTable')" @onSelect="onDeleteSelect">
+  <normal-table ref="list" rowKey="sa_promotion_authid" :param="{id:20230102102903,content:{sa_promotionid:props.id,where:{condition:''}}}" size="small" :tableid="utils.TBLayoutID('promotionModelPowerAreaTable')" :columns="utils.TBLayout('promotionModelPowerAreaTable')" @onSelect="onDeleteSelect">
     <template #tb_cell="{data}">
       <template v-if="data.column.dataIndex == 'limitamount' && utils.hasPermission('agentTabEdit')">
         <a-input type="number" :disabled="data.record.settlestatus == 1 || data.record.islimit == 0" v-model:value="data.record.limitamount" @change="data.record.ischange = true" @blur="onUpdateSelect(data.record)"></a-input>

src/DRP/HDrpManagement/promotionManage/index.vue

@@ -20,7 +20,7 @@
   let columns = ref([])
   let dataSource = ref([])
   let searchType = ref([
-    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'审核',value:'审核'},{remarks:'发布',value:'发布'},{remarks:'关闭',value:'关闭'}]},
     {label:'搜索',key:'condition',type:'input'},
   ])

src/DRP/HDrpManagement/rebatebill/index.vue

@@ -26,7 +26,7 @@
   let columns = ref([])
   let dataSource = ref([])
   let searchType = ref([
-    {label:'单据日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'结算',value:'结算'},{remarks:'审核',value:'审核'}]},
     {label:'搜索',key:'condition',type:'input'},
   ])

src/DRP/HDrpManagement/returnedPurchase/index.vue

@@ -42,7 +42,7 @@
   let columns = ref([])
   let dataSource = ref([])
   let searchType = ref([
-    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'提交',value:'提交'},{remarks:'审核',value:'审核'},{remarks:'复核',value:'复核'},{remarks:'关闭',value:'关闭'}]},
     {label:'搜索',key:'condition',type:'input'},
   ])

src/DRP/HDrpManagement/systemNotice/index.vue

@@ -22,7 +22,7 @@
   let dataSource = ref([])
   let searchType = ref([
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'全部',value:''},{remarks:'发布',value:'发布'}]},
-    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'搜索',key:'condition',type:'input'},
   ])
   let param = ref({

src/DRP/SDrpManagement/collection/index.vue

@@ -0,0 +1,289 @@
+<template>
+  <div class="y-container">
+    <prod-temp ref="prod" :noQuery="true" rowKey="itemid" size="small" :columns="utils.TBLayout('exportTable')" :param="param" :hideBorder="true" @onSelect="onProdSelect">
+      <template #operation>
+        <a-input class="search-input" v-model:value="search" @keyup.enter="onSearch" placeholder="搜索商品"></a-input>
+      </template>
+      <template #tb_cell="{data}">
+        <template v-if="data.column.dataIndex == 'image'">
+          <div class="image-panel">
+            <a-image
+              :width="80"
+              :src="data.record.attinfos[0]?data.record.attinfos[0].url:''"
+            />
+          </div>
+        </template>
+        <template v-if="data.column.dataIndex == 'qty'">
+          <a-input-number style="width:100px" id="inputNumber" v-model:value="data.record.favoritesqty" :min="data.record.orderminqty" :step="data.record.orderaddqty" @change="saveData(data.record)"/>
+        </template>
+        <template v-if="data.column.dataIndex == 'amount'">
+          <span class="color-red">¥&nbsp;{{utils.formatAmount(data.record.favoritesqty * data.record.gradeprice)}}</span>
+        </template>
+        <template v-if="data.column.dataIndex === 'length' && data.record.iscustomsize == 1">
+          <a-select v-if="data.record.lengthschemedetails.length > 0" v-model:value="data.record.favoriteslength" style="width: 150px" placeholder="选择长度" @change="saveData(data.record)">
+            <a-select-option v-for="item in data.record.lengthschemedetails" :key="item.sa_sizeschemedetailid" :value="item.num">{{item.num}}</a-select-option>
+          </a-select>
+          <a-input v-else style="width:200px;" v-model:value="data.record.favoriteslength" :placeholder="`${data.record.lengthmin}-${data.record.lengthmax}`" @blur="validInput(data.record,data.record.lengthmin,data.record.lengthmax,'length')">
+          </a-input>
+        </template>
+        <template v-if="data.column.dataIndex === 'width' && data.record.iscustomsize == 1">
+          <a-select v-if="data.record.widthschemedetails.length > 0" v-model:value="data.record.favoriteswidth" style="width: 150px" placeholder="选择宽度" @change="saveData(data.record)">
+            <a-select-option v-for="item in data.record.widthschemedetails" :key="item.sa_sizeschemedetailid" :value="item.num">{{item.num}}</a-select-option>
+          </a-select>
+          <a-input v-else style="width:200px;" v-model:value="data.record.favoriteswidth" :placeholder="`${data.record.widthmin}-${data.record.widthmax}`" @blur="validInput(data.record,data.record.widthmin,data.record.widthmax,'width')">
+          </a-input>
+        </template>
+      </template>
+    </prod-temp>
+    <div class="submit-panel">
+      <a-button style="margin-left:10px" type="default" :disabled="selectProd.length === 0" @click="deleteProd">取消收藏当前选中商品</a-button>
+      <p><span style="margin-right:20px">当前选中了<b class="color-red">&nbsp;{{selectProd.length}}&nbsp;</b>条商品</span>合计:<b class="color-red sumAmount">{{utils.formatAmount(sum)}}</b></p>
+      <div class="submit-btn" @click="onSubmit">创建订单</div>
+      <div class="shopcart-btn" @click="addCart">加入购物车</div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+  import ProdTemp from "@/template/normalTable/index.vue"
+  import utils from "@/utils/utils"
+  import Api from "@/api/api"
+  import {ref,computed,createVNode,onActivated} from 'vue'
+  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+  import { message } from 'ant-design-vue';
+  import { Modal } from 'ant-design-vue';
+  import { useRouter } from "vue-router"
+  import { useBaseStore } from '@/stores/modules/base'
+  import { storeToRefs } from 'pinia'
+  const base = useBaseStore()
+  const router = useRouter()
+  const prod = ref()
+  const search = ref('')
+  const selectProd = ref([])
+  const param = ref({id:20231121145103,content:{istool:0,pageNumber:1,pageSize:20,where:{condition:search}}})
+  const time = ref(null)
+  const sum =  computed(()=>{
+    let total = selectProd.value.reduce((accumulator, currentValue)=>accumulator + (currentValue.gradeprice * currentValue.favoritesqty), 0)
+    return total
+  })
+  const fieldSame = computed(()=>{
+    let _isFieldSame = selectProd.value.some(item=>item.tradefield_shoppingcart !== selectProd.value[0].tradefield_shoppingcart)
+
+    if (_isFieldSame) return message.error('存在不同领域的商品');
+
+    return _isFieldSame
+  })
+  const onProdSelect = (val)=>{
+    selectProd.value = val
+  }
+  const deleteProd = async (data)=>{
+    const res = await Api.requested({
+      "id": 20231122102803,
+      "content": {
+        "itemids": selectProd.value.map(element => {
+            return element.itemid
+          }),
+        "iscollection":false
+      },
+    })
+    utils.message(res,'成功',()=>{
+      prod.value.listData()
+    })
+  }
+  const onSubmit = ()=> {
+    if (!checkIscustomsize()) return false
+    if (fieldSame.value) return false
+    if (selectProd.value.length == 0)  return message.error('未选择商品无法创建订单')
+    Modal.confirm({
+      title:'生成订单',
+      content: `当前选中${selectProd.value.length}个商品`,
+      icon: createVNode(ExclamationCircleOutlined),
+      okText: '确认',
+      cancelText: '取消',
+      async onOk() {
+        const res = await Api.requested({
+          "id": 20221128183202,
+          "content": {
+            "type":'标准订单',
+            "tradefield":selectProd.value[0].tradefield[0].tradefield,
+            "items": selectProd.value.map(e=>{
+              return {
+                "sa_orderitemsid": 0, //写死0
+                "itemid": e.itemid, //商品ID
+                "sa_brandid": e.sa_brandid,
+                "sa_shoppingcartid":e.sa_shoppingcartid,
+                "qty": e.favoritesqty ? e.favoritesqty:e.favoritesqty, //数量
+                "length": e.favoriteslength,
+                "width": e.favoriteswidth
+              }
+            })
+          }
+        })
+        utils.message(res,'提交成功',()=>{
+          base.shopCartNum()
+          prod.value.listData()
+           Modal.confirm({
+            title:'创建成功',
+            content: `订单创建成功,是否跳转至该订单!`,
+            icon: createVNode(ExclamationCircleOutlined),
+            okText: '确认',
+            cancelText: '取消',
+            onOk() {
+              router.push({path:'/agent_orderDetails',query:{id:res.data.sa_orderid}})
+            },
+            cancelText: '取消',
+            onCancel() {
+              Modal.destroyAll();
+            },
+          });
+        })
+      },
+      cancelText: '取消',
+      onCancel() {
+        Modal.destroyAll();
+      },
+    });
+  }
+  const onSearch = ()=>{
+    param.value.content.pageNumber = 1
+    prod.value.listData()
+  }
+  const onSave = async (val)=>{
+    const res = await Api.requested({
+       "id": 20220924104302,
+        "content": val
+    })
+    utils.message(res,'修改成功')
+  }
+  const checkIscustomsize = (val)=>{
+    let bool = true
+    selectProd.value.map(e=>{
+      if (e.iscustomsize == 1 && (!e.favoriteslength || !e.favoriteswidth)) {
+        bool = false
+        message.error(e.itemname + '定制信息有误,请检查!')
+      }
+    })
+    return bool
+  }
+  const validInput = async (record,min,max,type)=>{
+    if (record[type] > max) {
+      record[type] = max
+    } else if (record[type] < min) {
+      record[type] = min
+    } else {
+      record[type] = record[type]
+    }
+  }
+  const saveData = (data,type)=>{
+    if(time.value !== null){
+      clearTimeout(time.value);
+    }
+    time.value = setTimeout(() => {
+      const save = async ()=>{
+        const res = await Api.requested({
+          "id": 20231121143403,
+          "version":1,
+          "content": { 
+            "itemid":data.itemid,
+            "length":data.favoriteslength,
+            "qty":data.favoritesqty,
+            "width":data.favoriteswidth,
+            "iscollection":true
+          }
+        })
+      }
+      utils.validateInputNumber(data.orderminqty,data.favoritesqty,data.orderaddqty).then(res=>{
+        data.favoritesqty = res
+        save()
+      })
+    },500)
+    
+  }
+  const addCart = async ()=> {
+    if (!checkIscustomsize()) return false
+    let res = await Api.requested({
+      "id": 20231024110003,
+      "content": {
+        "items":selectProd.value.map(e=>{
+          return {
+            "sa_brandid": e.brand[0].sa_brandid, //品牌id
+            "itemid": e.itemid, //货品id
+            "qty": e.favoritesqty, //数量
+            "itemno": e.itemno, //货品编号
+            "tradefield": e.tradefield[0].tradefield,
+            "length":e.favoriteslength,
+            "width":e.favoriteswidth
+          }
+        })
+      },
+    })
+    utils.message(res,'添加成功',()=>{
+    })
+  }
+  onActivated (()=>{
+    prod.value.listData()
+  })
+</script>
+<style scoped>
+.submit-panel{
+    position: sticky;
+    bottom:0;
+    display: flex;
+    align-items: center;
+    border: 1px solid #f1f2f3;
+    overflow: hidden;
+    background: #fff;
+    z-index: 999;
+
+}
+.submit-panel p{
+  flex:1;
+  margin: 0;
+  text-align: right;
+  padding: 0 10px;
+}
+.submit-btn{
+  float: right;
+  padding: 15px 20px;
+  background: red;
+  color:#fff;
+  width: 150px;
+  text-align: center;
+  cursor: pointer;
+  font-weight: bold;
+}
+.shopcart-btn{
+  float: right;
+  padding: 15px 20px;
+  background: #1677ff;
+  color:#fff;
+  width: 150px;
+  text-align: center;
+  cursor: pointer;
+  font-weight: bold;
+}
+.disabled-submit-btn{
+  background: #999;
+}
+.color-red{
+  color: red;
+}
+.sumAmount{
+  font-size: 1.5em;
+  margin-left:10px;
+}
+.search-input{
+  width: 300px;
+  margin-bottom: 20px;
+}
+.image-panel{
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  height: 100px;
+  width: 100px;
+  border-radius: 4px;
+  background: #f1f2f3;
+  overflow: hidden;
+}
+</style>

src/DRP/SDrpManagement/dispatchAgent/index.vue

@@ -24,7 +24,7 @@
   let dataSource = ref([])
   let searchType = ref([
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'审核',value:'审核'},{remarks:'复核',value:'复核'},{remarks:'关闭',value:'关闭'}]},
-    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'搜索',key:'condition',type:'input'},
   ])
   let param = ref({

src/DRP/SDrpManagement/dispatchMxAgent/index.vue

@@ -30,7 +30,7 @@
   let searchType = ref([
     // {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'预提交',value:'预提交'},{remarks:'确认',value:'确认'},{remarks:'提交',value:'提交'},{remarks:'审核',value:'审核'},{remarks:'关闭',value:'关闭'}]},
     // {label:'订单类型',key:'type',type:'select',dataSource:[{remarks:'标准订单',value:'标准订单'},{remarks:'促销订单',value:'促销订单'},{remarks:'特殊订单',value:'特殊订单'}]},
-    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'搜索',key:'condition',type:'input'},
   ])
   let param = ref({

src/DRP/SDrpManagement/ftMxAgent/index.vue

@@ -29,7 +29,7 @@
   let dataSource = ref([])
   let searchType = ref([
     {label:'类型',key:'type',type:'select',dataSource:[{remarks:'发货',value:'发货'},{remarks:'退货',value:'退货'}]},
-    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'搜索',key:'condition',type:'input'},
   ])
   let param = ref({

src/DRP/SDrpManagement/logisticsOrderAgent/index.vue

@@ -20,7 +20,7 @@
   let columns = ref([])
   let dataSource = ref([])
   let searchType = ref([
-    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'结算',value:'结算'},{remarks:'审核',value:'审核'}]},
     {label:'搜索',key:'condition',type:'input'},
   ])

src/DRP/SDrpManagement/myAccountList/index.vue

@@ -43,7 +43,7 @@ import listTemp from '@/components/listTemplate/index.vue';
 import tableExport from '@/components/tableExport/index.vue'
 let searchType = ref([
   {label:'类型',key:'type',type:'select',dataSource:[{remarks:'收入',value:'1'},{remarks:'支出',value:'0'}]},
-  {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+  {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
   {label:'搜索',key:'condition',type:'input'},
 ])
 let param = ref({

src/DRP/SDrpManagement/order/index.vue

@@ -30,7 +30,7 @@
   let searchType = ref([
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'预提交',value:'预提交'},{remarks:'确认',value:'确认'},{remarks:'提交',value:'提交'},{remarks:'审核',value:'审核'},{remarks:'关闭',value:'关闭'}]},
     {label:'订单类型',key:'type',type:'select',dataSource:[{remarks:'标准订单',value:'标准订单'},{remarks:'促销订单',value:'促销订单'},{remarks:'特殊订单',value:'特殊订单'}]},
-    {label:'下单日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'下单日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'搜索',key:'condition',type:'input'},
   ])
   let param = ref({

src/DRP/SDrpManagement/orderMxAgent/index.vue

@@ -37,7 +37,7 @@
       type:'select',
       dataSource:[{remarks:'待确认',value:'待确认'},{remarks:'待审核',value:'待审核'},{remarks:'待发货',value:'待发货'},{remarks:'已发货',value:'已发货'},{remarks:'已取消 ',value:'已取消'}],
     },
-    {label:'下单日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'下单日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'搜索',key:'condition',type:'input'},
   ])
   let param = ref({

src/DRP/SDrpManagement/productGroup/detail/index.vue

@@ -20,9 +20,14 @@
     <div style="flex:1" v-if="group.item[0]">
       <div style="position:relative;margin-bottom:30px">
         <h2>{{group.item[0].itemname}}
+          <span>
+            <StarOutlined v-if="group.item[0].iscollection == 0" @click="onCollection(group.item[0])"/>
+            <StarFilled v-else @click="onCollection(group.item[0])" style="color:orange"/>
+          </span>
           <a-tag v-show="group.item[0].delistingstatus" color="red">{{group.item[0].delistingstatus}}</a-tag>
         </h2>
       </div>
+      <p><span class="mr-10">火热促销中:</span><a-tag style="cursor: pointer;" v-for="item in group.item[0].canuseactivity" :key="item.sa_promotionid" color="red" @click="linkToPromotion(item)"><FireOutlined />{{item.promname}}</a-tag></p>
       <p class="label"><span class="mr-10">领域:</span><a-tag color="#108ee9" v-for="(item,index) in group.item[0].tradefield" :key="index">{{item.tradefield}}</a-tag></p>
       <p class="label"><span class="mr-10">商品编码:</span>{{group.item[0].itemno}}</p>
       <p class="label"><span class="mr-10">价格:</span><span class="price-label"><small>¥</small>{{utils.formatAmount(group.item[0].gradeprice)}}</span></p>
@@ -284,7 +289,6 @@
     return res.data
   }
   const getCustomsizeData =  async ()=>{
-    console.log(1)
     let lengthschemeid = group.value.item[0].lengthschemeid
     let widthschemeid = group.value.item[0].widthschemeid
     if (group.value.item[0].iscustomsize == 1)

src/DRP/SDrpManagement/remitvoucher/index.vue

@@ -29,7 +29,7 @@
   let dataSource = ref([])
   let searchType = ref([
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'提交',value:'提交'},{remarks:'审核',value:'审核'}]},
-    {label:'单据日期',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'搜索',key:'condition',type:'input'},
   ])
   let param = ref({

src/DRP/SDrpManagement/salerAfterBill/index.vue

@@ -21,7 +21,7 @@
   let dataSource = ref([])
   let searchType = ref([
     {label:'状态',key:'status',type:'select',dataSource:[{remarks:'新建',value:'新建'},{remarks:'提交',value:'提交'},{remarks:'审核',value:'审核'},{remarks:'复核',value:'复核'}]},
-    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate'],defaultData:[utils.date.yearStart,utils.date.yearEnd]},
     {label:'搜索',key:'condition',type:'input'},
   ])
   let param = ref({

src/components/listTemplate/field/index.vue

@@ -5,12 +5,13 @@
       <a-form
         ref="formRef"
         name="advanced_search"
-        :label-col="{ span: 8 }" 
-        :wrapper-col="{ span: 16 }"
+        labelAlign="left"
+        :label-col="{ span: 5 }" 
+        :wrapper-col="{ span: 19 }"
         :model="formState"
         @finish="onFinish">
           <a-row :gutter="16">
-            <a-col v-for="(i) in searchType" :key="i"  :md="{ span: 24, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xxl="{span: 4, offset: 0 }">
+            <a-col v-for="(i) in searchType" :key="i"  :md="{ span: 24, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xxl="{span: 6, offset: 0 }">
               <a-form-item
                 class="formItemBottom"
                 :name="i.key"
@@ -19,7 +20,7 @@
                 layout="vertical"
               >
                 <a-input v-if="i.type=='input'" v-model:value="formState[i.key]" :placeholder="i.label"></a-input>
-                <a-select v-if="i.type=='select'" v-model:value="formState[i.key]" :placeholder="i.label" :getPopupContainer="triggerNode => {return triggerNode.parentNode || document.body;}">
+                <a-select v-if="i.type=='select'" v-model:value="formState[i.key]" :placeholder="i.label" :getPopupContainer="triggerNode => {return triggerNode.parentNode || document.body;}" allowClear>
                   <a-select-option v-for="item in i.dataSource" :key="item.index" :value="item.value">{{item.remarks}}</a-select-option>
                 </a-select>
                 <a-date-picker style="width:100%" v-if="i.type == 'datepicker'" v-model:value="formState[i.key]" value-format="YYYY-MM-DD" :placeholder="i.label"/>
@@ -54,14 +55,18 @@
   </div>
 </template>
 <script setup>
-import { defineComponent, reactive, ref,defineEmits,onMounted,watch,computed} from 'vue';
+import { defineComponent, reactive, ref,defineEmits,defineProps,onActivated,onMounted} from 'vue';
 
 import { DownOutlined, UpOutlined } from '@ant-design/icons-vue';
 import { useRouter,onBeforeRouteLeave } from "vue-router";
 
 const router = useRouter()
 const props = defineProps({
-  searchType:Array
+  searchType:Array,
+  tableData:Function,
+  noAutoQuery:Boolean,
+  param:Object
+
 })
 const expand = ref(false);
 const formRef = ref();
@@ -93,15 +98,20 @@ const dateRangeChange = (dates,i)=>{
       formState.value[o] = ''
     })
   }
-  
-}
-const onTest = (val)=>{
-  console.log(val)
 }
 onMounted(()=>{
   props.searchType.forEach(e=>{
+    if (e.objKeys && e.defaultData) {
+      e.objKeys.forEach((o,index)=>{
+        formState.value[o] = e.defaultData[index]
+      })
+    }
     formState.value[e.key] = e.defaultData
   })
+  props.param.content.where = Object.assign({},props.param.content.where,formState.value)
+})
+defineExpose({
+  formState
 })
 </script>
 <style>

src/components/listTemplate/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div v-if="props.searchType" >
-      <field :searchType="props.searchType" @onSubmit="search"></field>
+      <field :searchType="props.searchType" :param="props.param" @onSubmit="search"></field>
     </div>
     <a-card id="fulltable" :bodyStyle="{padding:'10px'}">
       <template #title>
@@ -190,7 +190,6 @@
   })
   onMounted (()=>{
     getTableLayout()
-    // props.noAutoQuery ? '' : tableData()
   })
   onActivated (()=>{
     props.noAutoQuery ? '' : tableData()

src/customized/cucu/orderManage/modules/add.vue

@@ -70,7 +70,7 @@
                 placeholder="选择领域"
                 style="width: 100%"
               >
-                <a-select-option :value="item.tradefield" v-for="item in tradefieldOptions" :key="item.index">{{item.tradefield}}</a-select-option>
+                <a-select-option :value="item.value" v-for="item in tradefieldOptions" :key="item.index">{{item.remarks}}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
@@ -153,12 +153,7 @@ const onSelect = (val)=>{
 }
 const tradefieldOptions = ref([])
 const agentTradeField = async ()=>{
-  const res = await Api.requested({
-    "id": 20230219212802,
-    "content": {
-      "sys_enterpriseid": form.value.sys_enterpriseid,
-    }
-  })
+  const res = await Api.optionstype('tradefield')
   tradefieldOptions.value = res.data
 
   // form.value.tradefield = tradefieldOptions.value[0].tradefield
@@ -167,9 +162,7 @@ const brandOptions = ref([])
 const agentBrandField = async ()=>{
   const res = await Api.requested({
     "id": 20220924163702,
-    "content": {
-      "sys_enterpriseid": form.value.sys_enterpriseid,
-    }
+    "content": {}
   })
   brandOptions.value = res.data
 

src/style.less

@@ -17,7 +17,6 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -webkit-text-size-adjust: 100%;
-  
 }
 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {

src/utils/utils.js

@@ -255,5 +255,9 @@ export default {
     hide:()=>{
       message.loading({content:'操作正在执行,请稍等..',duration:10,});
     }
+  },
+  date:{
+    yearStart:`${(new Date).getFullYear()}-01-01`,
+    yearEnd:`${(new Date).getFullYear()}-12-31`,
   }
 }