fixed 商品的导出导入

src/views/business/GoodsManager/Goodss/components/AddDialog.vue

@@ -106,9 +106,9 @@
 
           <el-row v-if="formData.goodsSpecType == 1">
             <el-col :lg="24">
-              <el-form-item :label-width="labelWidth" label="商品价格" prop="goodsPriceHighest">
+              <el-form-item :label-width="labelWidth" label="商品价格" prop="goodsPriceLowest">
                 <div style="display: block;">
-                  <el-input-number v-model.number="formData.goodsPriceHighest" controls-position="right" :min="0.01"
+                  <el-input-number v-model.number="formData.goodsPriceLowest" controls-position="right" :min="0.01"
                     :precision="2" />
                   <span style="margin-left: 10px;">元</span>
                   <div class="input-intro">商品的实际购买金额，最低0.01</div>
@@ -116,9 +116,9 @@
               </el-form-item>
             </el-col>
             <el-col :lg="24">
-              <el-form-item :label-width="labelWidth" label="划线价格" prop="goodsDashedPriceHighest">
+              <el-form-item :label-width="labelWidth" label="划线价格" prop="goodsDashedPriceLowest">
                 <div style="display: block;">
-                  <el-input-number v-model.number="formData.goodsDashedPriceHighest" controls-position="right" :min="0"
+                  <el-input-number v-model.number="formData.goodsDashedPriceLowest" controls-position="right" :min="0"
                     :precision="2" />
                   <span style="margin-left: 10px;">元</span>
                   <div class="input-intro">划线价仅用于商品页展示</div>
@@ -343,6 +343,12 @@ import MultiSpec from './MultiSpec/MultiSpec.vue';
 // 打开弹窗时回调
 const openDialog = async () => {
 
+  if (userid != 1) {
+    await getTreeList()
+    await getDeliveryList()
+    await getGoodsServicesList()
+  }
+
   await getdeduct_stock_type()
   await getspec_type()
   await getis_points_gift()
@@ -518,7 +524,7 @@ const formData = reactive({
   skuList: [],
   goodsSpecType: 1,
   goodsDeductStockType: 1,
-  goodsPriceHighest: 1.00,
+  goodsPriceLowest: 1.00,
   goodsTotalInventory: 100,
   goodsSalesInitial: 0,
   goodsShelfStatus: 1,
@@ -544,7 +550,7 @@ const rules = reactive({
   deliveryGuid: [{ required: true, message: "配送模板不能为空", trigger: "blur" }],
   goodsName: [{ required: true, message: "名称不能为空", trigger: "blur" }],
   goodsPicture: [{ required: true, message: "图片不能为空", trigger: "blur" }],
-  goodsPriceHighest: [{ required: true, message: "价格不能为空", trigger: "blur" }],
+  goodsPriceLowest: [{ required: true, message: "价格不能为空", trigger: "blur" }],
   goodsTotalInventory: [{ required: true, message: "库存总量不能为空", trigger: "blur", type: "number" }],
   goodsSalesInitial: [{ required: true, message: "初始销量不能为空", trigger: "blur", type: "number" }],
   goodsDetails: [{ required: true, message: "详情不能为空", trigger: "blur" }],
@@ -604,7 +610,7 @@ const closeDialog = () => {
 
   // 基础信息
   formData.shopName = ""
-  formData.shopGuid = ""
+  formData.shopGuid = null
   dataList.value = []
   deliveryDataList.value = []
 

src/views/business/GoodsManager/Goodss/components/EditDialog.vue

@@ -102,9 +102,9 @@
 
           <el-row v-if="formData.goodsSpecType == 1">
             <el-col :lg="24">
-              <el-form-item :label-width="labelWidth" label="商品价格" prop="goodsPriceHighest">
+              <el-form-item :label-width="labelWidth" label="商品价格" prop="goodsPriceLowest">
                 <div style="display: block;">
-                  <el-input-number v-model.number="formData.goodsPriceHighest" controls-position="right" :min="0.01"
+                  <el-input-number v-model.number="formData.goodsPriceLowest" controls-position="right" :min="0.01"
                     :precision="2" />
                   <span style="margin-left: 10px;">元</span>
                   <div class="input-intro">商品的实际购买金额，最低0.01</div>
@@ -112,9 +112,9 @@
               </el-form-item>
             </el-col>
             <el-col :lg="24">
-              <el-form-item :label-width="labelWidth" label="划线价格" prop="goodsDashedPriceHighest">
+              <el-form-item :label-width="labelWidth" label="划线价格" prop="goodsDashedPriceLowest">
                 <div style="display: block;">
-                  <el-input-number v-model.number="formData.goodsDashedPriceHighest" controls-position="right" :min="0"
+                  <el-input-number v-model.number="formData.goodsDashedPriceLowest" controls-position="right" :min="0"
                     :precision="2" />
                   <span style="margin-left: 10px;">元</span>
                   <div class="input-intro">划线价仅用于商品页展示</div>
@@ -529,7 +529,7 @@ const rules = reactive({
   deliveryGuid: [{ required: true, message: "配送模板不能为空", trigger: "blur" }],
   goodsName: [{ required: true, message: "名称不能为空", trigger: "blur" }],
   goodsPicture: [{ required: true, message: "图片不能为空", trigger: "blur" }],
-  goodsPriceHighest: [{ required: true, message: "价格不能为空", trigger: "blur" }],
+  goodsPriceLowest: [{ required: true, message: "价格不能为空", trigger: "blur" }],
   goodsTotalInventory: [{ required: true, message: "库存总量不能为空", trigger: "blur", type: "number" }],
   goodsSalesInitial: [{ required: true, message: "初始销量不能为空", trigger: "blur", type: "number" }],
   goodsDetails: [{ required: true, message: "详情不能为空", trigger: "blur" }],
@@ -598,7 +598,7 @@ const closeDialog = () => {
 
   // 基础信息
   formData.value.shopName = ""
-  formData.value.shopGuid = ""
+  formData.value.shopGuid = null
   dataList.value = []
   deliveryDataList.value = []
 

src/views/business/GoodsManager/Goodss/index.vue

@@ -317,13 +317,11 @@ function handleDelete(row) {
 function handleExport(row) {
   const Ids = row.goodsId || ids.value
   const name = ref("所有")
-  console.log(Ids,'ids是什么呢');
   if (Ids.length != 0) {
     const ids = Object.values(Ids).map(value => String(value));
     const str = ids.join(',');
     queryParams.value.ids = str
     name.value = "选中"
-    console.log(queryParams.value,'搜索内容');
   }
 
   ElMessageBox.confirm('是否确认导出' + name.value + '数据?', '警告', {

src/views/business/LogisticsManage/Deliverys/components/EditDialog.vue

@@ -11,7 +11,7 @@
     <el-form ref="formRef" :model="formData" :rules="rules">
 
 
-      <el-row >
+      <el-row>
         <el-col v-if="userid == 1" :lg="12">
           <el-form-item :label-width="labelWidth" label="店铺" prop="shopGuid">
             <el-input v-model='formData.shopName' disabled type="text">
@@ -53,8 +53,8 @@
               </el-table-column>
               <el-table-column prop="deliveryRuleFirst" :label=deliveryRuleFirstTitle>
                 <template #default="scope">
-                  <el-input-number v-if="formData.deliveryBillingMethod == 1"
+                  <el-input-number v-if="formData.deliveryBillingMethod == 1" v-model.number="scope.row.deliveryRuleFirst"
-                    v-model.number="scope.row.deliveryRuleFirst" controls-position="right" :min="0" />
+                    controls-position="right" :min="0" />
                   <el-input-number v-else v-model.number="scope.row.deliveryRuleFirst" controls-position="right" :min="0"
                     :precision="2" />
                 </template>
@@ -109,6 +109,7 @@
 
 <script setup>
 import { ElMessage } from 'element-plus'
+import { ElMessageBox } from 'element-plus'
 import modal from '@/plugins/modal.js'
 import { reactive, ref, watch } from "vue";
 import useUserStore from '@/store/modules/user'
@@ -264,6 +265,10 @@ const handleEditClick = async (formEl) => {
     }
 
     deliveryRuleDataList.value.map((item) => {
+      console.log(item.deliveryRuleRegion,'asda');
+      if (item.deliveryRuleRegion == null) {
+        return
+      }
       const transformedRegion = item.deliveryRuleRegion.map((regionItem) => regionItem.id);
       item.deliveryRuleRegion = transformedRegion.join(',');
       item.deliveryGuid = formData.value.deliveryGuid