Merge branch 'main' of http://47.109.205.240:3000/Web/operation-system

src/views/goods/goodsManage/addGoods.vue

@@ -54,7 +54,7 @@
         </el-form-item>
         <div v-if="formInline.specStyle == '1'">
           <el-form-item label="规格名称" prop="goodSpecs" required>
-            <el-input v-model="formInline.goodSpecs" class="attr-clomn" placeholder="请输入规格名称" />
+            <el-input v-model="formInline.goodSpecs" clearable class="attr-clomn" placeholder="请输入规格名称" />
           </el-form-item>
           <!-- 销售价格 -->
           <el-form-item label="销售价格" prop="salePrice" required>
@@ -219,6 +219,9 @@ import { getRegion } from "@/api/common";
 import { ElMessage } from "element-plus";
 import areaList from "./areaList";
 
+const route = useRoute()
+const router = useRouter()
+
 const formRef = ref(null)
 const formInline = reactive({
   goodName: "",
@@ -232,6 +235,7 @@ const formInline = reactive({
   traceCode: "", //溯源码
 
   specStyle: "1",//规格样式 1单规格 2多规格
+  goodSpecs: "",
   salePrice: 1,//销售价格-单规格
   stock: 1,//库存数量-单规格
   netContent: 1,//净含量-单规格
@@ -324,6 +328,24 @@ const rules = reactive({
   specStyle: [
     { required: true, message: '请选择规格样式', trigger: 'change' }
   ],
+  goodSpecs: formInline.specStyle == '1' ? [
+    {
+      required: true,
+      message: '请输入规格名称',
+      trigger: ['blur', 'change']
+    },
+    {
+      validator: (rule, value, callback) => {
+        console.log(value);
+        if (value == "" || value.trim() === "" ) {
+          callback(new Error('请输入规格名称'))
+        } else {
+          callback()
+        }
+      },
+      trigger: ['blur', 'change']
+    },
+  ] : [],
   salePrice: formInline.specStyle == '1' ? [
     {
       validator: (rule, value, callback) => {

src/views/goods/goodsManage/editGoods.vue

@@ -235,6 +235,7 @@ const formInline = reactive({
   traceCode: "", //溯源码
 
   specStyle: "1",//规格样式 1单规格 2多规格
+  goodSpecs: "",
   salePrice: 1,//销售价格-单规格
   stock: 1,//库存数量-单规格
   netContent: 1,//净含量-单规格
@@ -327,6 +328,24 @@ const rules = reactive({
   specStyle: [
     { required: true, message: '请选择规格样式', trigger: 'change' }
   ],
+  goodSpecs: formInline.specStyle == '1' ? [
+    {
+      required: true,
+      message: '请输入规格名称',
+      trigger: ['blur', 'change']
+    },
+    {
+      validator: (rule, value, callback) => {
+        console.log(value);
+        if (value == "" || value.trim() === "" ) {
+          callback(new Error('请输入规格名称'))
+        } else {
+          callback()
+        }
+      },
+      trigger: ['blur', 'change']
+    },
+  ] : [],
   salePrice: formInline.specStyle == '1' ? [
     {
       validator: (rule, value, callback) => {

src/views/goods/goodsManage/seeDetails.vue

@@ -43,7 +43,7 @@
         <el-form-item label="商品图片" prop="goodUrl" required>
           <div>
             <!-- <myUploadImage v-model="formInline.goodUrl"></myUploadImage> -->
-            <img style="width: 120px;" :src="formInline.goodUrl" alt="">
+            <img style="width: 120px;" v-for="(src,index) in goodurls" :key="index" :src="src" alt="">
           </div>
         </el-form-item>
         <!-- 规格样式 -->
@@ -88,9 +88,9 @@
           <el-form-item label="商品规格" prop="netWeight" required>
             <div v-for="(item, index) in formInline.netWeight" :key="index" class="attr-item">
               <el-input v-model="item.goodSpecs" :value="item.goodSpecs" class="attr-clomn" placeholder="请输入规格名称" />
-              <el-icon size="20px" v-if="index !== 0" @click="deleteSpecs(index)" style="cursor: pointer;">
+              <!-- <el-icon size="20px" v-if="index !== 0" @click="deleteSpecs(index)" style="cursor: pointer;">
                 <Delete />
-              </el-icon>
+              </el-icon> -->
             </div>
             <!-- <el-button icon="plus" type="primary" plain style="margin: 0" @click="addSpecs">添加规格</el-button> -->
           </el-form-item>
@@ -223,6 +223,7 @@ import { getRegion } from "@/api/common";
 import { ElMessage } from "element-plus";
 import areaList from "./areaList";
 import useOperateStore from "@/store/modules/operate";
+import { computed } from "vue";
 const operateStore = useOperateStore();
 
 const route = useRoute()
@@ -426,6 +427,7 @@ const rules = reactive({
     { required: true, message: '请输入详细地址', trigger: 'blur' }
   ],
 })
+
 const addSpecs = () => {
   formInline.netWeight.push({
     goodSpecs: "",
@@ -613,15 +615,19 @@ const getGoodsInfo = async (goodId) => {
   }
 };
 
+let goodurls = computed(() => {
+  return formInline.goodUrl.split(",")
+})
+
 watch(() => route.query, (newVal) => {
-  console.log("watch商品id:", newVal.goodId);
+  // console.log("watch商品id:", newVal.goodId);
   if (newVal.goodId) {
     getGoodsInfo(newVal.goodId);
   }
 })
 onMounted(async () => {
   const { edit, goodId } = route.query;
-  console.log("onMounted商品id:", goodId);
+  // console.log("onMounted商品id:", goodId);
   getActiveInfo();
   await getGoodTypeList();
   getArea();

src/views/goods/goodsReview/auditGoods.vue

@@ -43,7 +43,7 @@
         <el-form-item label="商品图片" prop="goodUrl" required>
           <div>
             <!-- <myUploadImage v-model="formInline.goodUrl"></myUploadImage> -->
-            <img style="width: 120px;" :src="formInline.goodUrl" alt="">
+            <img style="width: 120px;" v-for="(src,index) in goodurls" :key="index" :src="src" alt="">
           </div>
         </el-form-item>
         <!-- 规格样式 -->
@@ -653,6 +653,10 @@ const getGoodsInfo = async (goodId) => {
   }
 };
 
+let goodurls = computed(() => {
+  return formInline.goodUrl.split(",")
+})
+
 watch(() => route.query, (newVal) => {
   console.log("watch商品id:", newVal.goodId);
   if (newVal.goodId) {