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

src/layout/components/AppMain.vue

@@ -2,9 +2,9 @@
   <section class="app-main">
     <router-view v-slot="{ Component, route }">
       <transition name="fade-transform" mode="out-in">
-        <keep-alive :include="tagsViewStore.cachedViews">
+        <!-- <keep-alive :include="tagsViewStore.cachedViews"> -->
-          <component v-if="!route.meta.link" :is="Component" :key="route.path"/>
+        <component v-if="!route.meta.link" :is="Component" :key="route.path" />
-        </keep-alive>
+        <!-- </keep-alive> -->
       </transition>
     </router-view>
     <iframe-toggle />
@@ -13,24 +13,24 @@
 </template>
 
 <script setup>
-import copyright from "./Copyright/index"
+import copyright from "./Copyright/index";
-import iframeToggle from "./IframeToggle/index"
+import iframeToggle from "./IframeToggle/index";
-import useTagsViewStore from '@/store/modules/tagsView'
+import useTagsViewStore from "@/store/modules/tagsView";
 
-const route = useRoute()
+const route = useRoute();
-const tagsViewStore = useTagsViewStore()
+const tagsViewStore = useTagsViewStore();
 
 onMounted(() => {
-  addIframe()
+  addIframe();
-})
+});
 
 watchEffect(() => {
-  addIframe()
+  addIframe();
-})
+});
 
 function addIframe() {
   if (route.meta.link) {
-    useTagsViewStore().addIframeView(route)
+    useTagsViewStore().addIframeView(route);
   }
 }
 </script>
@@ -86,4 +86,3 @@ function addIframe() {
   border-radius: 3px;
 }
 </style>
-

src/views/goods/contrabandManage/index.vue

@@ -278,10 +278,20 @@ const onSaveCategory = () => {
 };
 const addItem = () => {
   dialogTitle.value = "添加违禁物品";
+  Object.assign(dialogForm, { // 保持响应性，手动清空字段
+    id: "",
+    violateGoodName: "",
+    goodParameter: "",
+  });
   dialogFormVisible.value = true;
 };
 const cancelDialog = () => {
   dialogRef.value.resetFields();
+  Object.assign(dialogForm, { // 保持响应性，手动清空字段
+    id: "",
+    violateGoodName: "",
+    goodParameter: "",
+  });
   dialogFormVisible.value = false;
 };
 

src/views/goods/goodsCategory/index.vue

@@ -102,7 +102,7 @@ import {
   getGoodCategoryInfo,
   getGoodType,
   categoryAdd, categoryEdit,
-  categoryRemove,enableAndDisableCategory
+  categoryRemove, enableAndDisableCategory
 } from "@/api/goods/info";
 import { ca } from "element-plus/es/locales.mjs";
 const { proxy } = getCurrentInstance();
@@ -139,15 +139,15 @@ const searchForm = ref(null);
 const onSubmit = () => {
   formInline.current = 1;
   formInline.status = formInline.status == undefined ? "" : formInline.status;
-  if  (formInline.startDate && !formInline.endDate) {
+  if (formInline.startDate && !formInline.endDate) {
     ElMessage.warning("请选择结束日期！");
     return;
   }
   if (formInline.endDate && !formInline.startDate) {
-     ElMessage.warning("请选择开始日期！");
+    ElMessage.warning("请选择开始日期！");
     return;
   }
-  console.log( formInline);
+  console.log(formInline);
   loadData();
 };
 const resetForm = () => {
@@ -256,7 +256,7 @@ const enableAndDisable = async (row, num) => {
     tableLoading.value = false;
     if (res.code == 200) {
       onSubmit();
-      if  (num == 1) {
+      if (num == 1) {
         ElMessage.success("启用成功！");
       } else {
         ElMessage.success("禁用成功！");
@@ -280,7 +280,7 @@ const handleEdit = (row) => {
   dialogForm.name = row.name;
   dialogForm.level = row.level;
   dialogForm.parentId = row.parentId;
-  dialogForm.status = row.status.toString();
+  dialogForm.status = row.status?.toString() ?? '1';
 };
 // 删除操作
 const handleDelete = (row) => {
@@ -314,7 +314,7 @@ const dialogTitle = ref("添加分类");
 const dialogForm = reactive({
   type: null, //分类类型归属，类型1->农资交易,2->供应商服务，3->采购商服务,4->土地交易
   name: "", //分类名字
-  parentId: [], //父级id
+  parentId: "", //父级id
   level: "", //分类层级,parentId的长度
   sort: "", //排序值
   status: "1", //分类状态(1-启用 2-禁用)
@@ -400,10 +400,27 @@ const onSaveCategory = () => {
 const addCategory = () => {
   dialogTitle.value = "添加分类";
   getGoodTypeList();
+  dialogRef.value.resetFields();
+  Object.assign(dialogForm, { // 保持响应性，手动清空字段
+    id: "",
+    type: null,
+    name: "",
+    level: "",
+    parentId: "",
+    status: "1",
+  });
   dialogFormVisible.value = true;
 };
 const cancelDialog = () => {
   dialogRef.value.resetFields();
+  Object.assign(dialogForm, { // 保持响应性，手动清空字段
+    id: "",
+    type: null,
+    name: "",
+    level: "",
+    parentId: "",
+    status: "1",
+  });
   dialogFormVisible.value = false;
 };
 

src/views/order/cancelled.vue

@@ -24,27 +24,27 @@
               class="demo-form-inline"
               :label-width="'auto'"
             >
-              <el-form-item label="商品名称" prop="goodName">
-                <el-input
-                  v-model="formInline.goodName"
-                  placeholder="请输入商品名称"
-                  clearable
-                />
-              </el-form-item>
               <el-form-item label="订单编号" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.orderNo"
                   placeholder="请输入订单编号"
                   clearable
                 />
               </el-form-item>
               <el-form-item label="买家名称" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.receiverName"
                   placeholder="请输入买家名称"
                   clearable
                 />
               </el-form-item>
+              <el-form-item label="买家电话" prop="goodName">
+                <el-input
+                  v-model="formInline.receiverPhone"
+                  placeholder="请输入买家电话"
+                  clearable
+                />
+              </el-form-item>
             </el-form>
           </div>
           <div class="search-bar-right">
@@ -280,6 +280,8 @@ const formInline = reactive({
   orderStatus: "7",
   current: 1,
   size: 10,
+  receiverName: "",
+  receiverPhone: "",
 });
 const goodsCategoryList = ref([
   { name: "蔬菜", id: 1 },

src/views/order/completed.vue

@@ -24,27 +24,27 @@
               class="demo-form-inline"
               :label-width="'auto'"
             >
-              <el-form-item label="商品名称" prop="goodName">
-                <el-input
-                  v-model="formInline.goodName"
-                  placeholder="请输入商品名称"
-                  clearable
-                />
-              </el-form-item>
               <el-form-item label="订单编号" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.orderNo"
                   placeholder="请输入订单编号"
                   clearable
                 />
               </el-form-item>
               <el-form-item label="买家名称" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.receiverName"
                   placeholder="请输入买家名称"
                   clearable
                 />
               </el-form-item>
+              <el-form-item label="买家电话" prop="goodName">
+                <el-input
+                  v-model="formInline.receiverPhone"
+                  placeholder="请输入买家电话"
+                  clearable
+                />
+              </el-form-item>
             </el-form>
           </div>
           <div class="search-bar-right">
@@ -280,6 +280,8 @@ const formInline = reactive({
   orderStatus: "8",
   current: 1,
   size: 10,
+  receiverName: "",
+  receiverPhone: "",
 });
 const goodsCategoryList = ref([
   { name: "蔬菜", id: 1 },

src/views/order/obligation.vue

@@ -24,27 +24,27 @@
               class="demo-form-inline"
               :label-width="'auto'"
             >
-              <el-form-item label="商品名称" prop="goodName">
-                <el-input
-                  v-model="formInline.goodName"
-                  placeholder="请输入商品名称"
-                  clearable
-                />
-              </el-form-item>
               <el-form-item label="订单编号" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.orderNo"
                   placeholder="请输入订单编号"
                   clearable
                 />
               </el-form-item>
               <el-form-item label="买家名称" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.receiverName"
                   placeholder="请输入买家名称"
                   clearable
                 />
               </el-form-item>
+              <el-form-item label="买家电话" prop="goodName">
+                <el-input
+                  v-model="formInline.receiverPhone"
+                  placeholder="请输入买家电话"
+                  clearable
+                />
+              </el-form-item>
             </el-form>
           </div>
           <div class="search-bar-right">
@@ -280,9 +280,11 @@ const router = useRouter();
 const preserveExpanded = ref(true);
 const formInline = reactive({
   orderNo: "",
-  orderStatus: 1,
+  orderStatus: "1",
   current: 1,
   size: 10,
+  receiverName: "",
+  receiverPhone: "",
 });
 const goodsCategoryList = ref([
   { name: "蔬菜", id: 1 },
@@ -544,8 +546,8 @@ onBeforeUnmount(() => {
 <style lang="scss" scoped>
 .send-buttons-info {
   float: left;
-  width: 100%;
+  width: 150px;
-  text-align: left;
+  text-align: center;
   height: 25px;
   line-height: 25px;
   border-radius: 5px;

src/views/order/orderDetails.vue

@@ -332,6 +332,8 @@ watch(
   () => route.query.data,
   (newSearch) => {
     if (route.query.data) {
+      console.log("有新值");
+
       getOrderDetails();
     }
   }

src/views/order/receivedGoods.vue

@@ -24,27 +24,27 @@
               class="demo-form-inline"
               :label-width="'auto'"
             >
-              <el-form-item label="商品名称" prop="goodName">
-                <el-input
-                  v-model="formInline.goodName"
-                  placeholder="请输入商品名称"
-                  clearable
-                />
-              </el-form-item>
               <el-form-item label="订单编号" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.orderNo"
                   placeholder="请输入订单编号"
                   clearable
                 />
               </el-form-item>
               <el-form-item label="买家名称" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.receiverName"
                   placeholder="请输入买家名称"
                   clearable
                 />
               </el-form-item>
+              <el-form-item label="买家电话" prop="goodName">
+                <el-input
+                  v-model="formInline.receiverPhone"
+                  placeholder="请输入买家电话"
+                  clearable
+                />
+              </el-form-item>
             </el-form>
           </div>
           <div class="search-bar-right">
@@ -280,9 +280,11 @@ const router = useRouter();
 const preserveExpanded = ref(true);
 const formInline = reactive({
   orderNo: "",
-  orderStatus: 6,
+  orderStatus: "6",
   current: 1,
   size: 10,
+  receiverName: "",
+  receiverPhone: "",
 });
 const goodsCategoryList = ref([
   { name: "蔬菜", id: 1 },
@@ -537,8 +539,8 @@ onBeforeUnmount(() => {
 <style lang="scss" scoped>
 .send-buttons-info {
   float: left;
-  width: 100%;
+  width: 150px;
-  text-align: left;
+  text-align: center;
   height: 25px;
   line-height: 25px;
   border-radius: 5px;

src/views/order/refunded.vue

@@ -24,27 +24,27 @@
               class="demo-form-inline"
               :label-width="'auto'"
             >
-              <el-form-item label="商品名称" prop="goodName">
-                <el-input
-                  v-model="formInline.goodName"
-                  placeholder="请输入商品名称"
-                  clearable
-                />
-              </el-form-item>
               <el-form-item label="订单编号" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.orderNo"
                   placeholder="请输入订单编号"
                   clearable
                 />
               </el-form-item>
               <el-form-item label="买家名称" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.receiverName"
                   placeholder="请输入买家名称"
                   clearable
                 />
               </el-form-item>
+              <el-form-item label="买家电话" prop="goodName">
+                <el-input
+                  v-model="formInline.receiverPhone"
+                  placeholder="请输入买家电话"
+                  clearable
+                />
+              </el-form-item>
             </el-form>
           </div>
           <div class="search-bar-right">
@@ -280,9 +280,11 @@ const router = useRouter();
 const preserveExpanded = ref(true);
 const formInline = reactive({
   orderNo: "",
-  orderStatus: 3,
+  orderStatus: "3",
   current: 1,
   size: 10,
+  receiverName: "",
+  receiverPhone: "",
 });
 const goodsCategoryList = ref([
   { name: "蔬菜", id: 1 },
@@ -537,8 +539,8 @@ onBeforeUnmount(() => {
 <style lang="scss" scoped>
 .send-buttons-info {
   float: left;
-  width: 100%;
+  width: 150;
-  text-align: left;
+  text-align: center;
   height: 25px;
   line-height: 25px;
   border-radius: 5px;

src/views/order/salesService.vue

@@ -24,27 +24,27 @@
               class="demo-form-inline"
               :label-width="'auto'"
             >
-              <el-form-item label="商品名称" prop="goodName">
-                <el-input
-                  v-model="formInline.goodName"
-                  placeholder="请输入商品名称"
-                  clearable
-                />
-              </el-form-item>
               <el-form-item label="订单编号" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.orderNo"
                   placeholder="请输入订单编号"
                   clearable
                 />
               </el-form-item>
               <el-form-item label="买家名称" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.receiverName"
                   placeholder="请输入买家名称"
                   clearable
                 />
               </el-form-item>
+              <el-form-item label="买家电话" prop="goodName">
+                <el-input
+                  v-model="formInline.receiverPhone"
+                  placeholder="请输入买家电话"
+                  clearable
+                />
+              </el-form-item>
             </el-form>
           </div>
           <div class="search-bar-right">
@@ -218,10 +218,10 @@
           <template #action="slotProps">
             <div>
               <div>
-                <div @click="goSend(slotProps.row)" class="send-button">
+                <div @click="goSend(slotProps.row.id)" class="send-button">
                   同意退款
                 </div>
-                <div @click="goSend(slotProps.row)" class="send-buttons">
+                <div @click="goSend(slotProps.row.id)" class="send-buttons">
                   拒绝退款
                 </div>
               </div>
@@ -289,9 +289,11 @@ const router = useRouter();
 const preserveExpanded = ref(true);
 const formInline = reactive({
   orderNo: "",
-  orderStatus: 10,
+  orderStatus: "10",
   current: 1,
   size: 10,
+  receiverName: "",
+  receiverPhone: "",
 });
 const goodsCategoryList = ref([
   { name: "蔬菜", id: 1 },

src/views/order/sendGoods.vue

@@ -92,27 +92,27 @@
               class="demo-form-inline"
               :label-width="'auto'"
             >
-              <el-form-item label="商品名称" prop="goodName">
-                <el-input
-                  v-model="formInline.goodName"
-                  placeholder="请输入商品名称"
-                  clearable
-                />
-              </el-form-item>
               <el-form-item label="订单编号" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.orderNo"
                   placeholder="请输入订单编号"
                   clearable
                 />
               </el-form-item>
               <el-form-item label="买家名称" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.receiverName"
                   placeholder="请输入买家名称"
                   clearable
                 />
               </el-form-item>
+              <el-form-item label="买家电话" prop="goodName">
+                <el-input
+                  v-model="formInline.receiverPhone"
+                  placeholder="请输入买家电话"
+                  clearable
+                />
+              </el-form-item>
             </el-form>
           </div>
           <div class="search-bar-right">
@@ -288,7 +288,7 @@
             <div @click="upAddress(slotProps.row)" class="send-button">
               修改收货地址
             </div>
-            <div @click="goSends(slotProps.row.id)" class="send-buttons-info">
+            <div @click="goSends(slotProps.row)" class="send-buttons-info">
               查看详情
             </div>
             <!-- <el-tooltip effect="dark" placement="bottom-end">
@@ -355,9 +355,11 @@ let dialogVisible = ref(false);
 let upid = ref(0);
 const formInline = reactive({
   orderNo: "",
-  orderStatus: 3,
+  orderStatus: "3",
   current: 1,
   size: 10,
+  receiverName: "",
+  receiverPhone: "",
 });
 const goodsCategoryList = ref([
   { name: "蔬菜", id: 1 },

src/views/order/sendGoodsInfo.vue

@@ -142,7 +142,7 @@ const router = useRouter();
 const tableData = ref([]);
 const radio1 = ref("2");
 onMounted(() => {
-  console.log(JSON.parse(route.query.data));
+  // console.log(JSON.parse(route.query.data));
   tableData.value = JSON.parse(route.query.data).orderItemInfos;
 });
 

src/views/order/shipped.vue

@@ -92,27 +92,27 @@
               class="demo-form-inline"
               :label-width="'auto'"
             >
-              <el-form-item label="商品名称" prop="goodName">
-                <el-input
-                  v-model="formInline.goodName"
-                  placeholder="请输入商品名称"
-                  clearable
-                />
-              </el-form-item>
               <el-form-item label="订单编号" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.orderNo"
                   placeholder="请输入订单编号"
                   clearable
                 />
               </el-form-item>
               <el-form-item label="买家名称" prop="goodName">
                 <el-input
-                  v-model="formInline.goodName"
+                  v-model="formInline.receiverName"
                   placeholder="请输入买家名称"
                   clearable
                 />
               </el-form-item>
+              <el-form-item label="买家电话" prop="goodName">
+                <el-input
+                  v-model="formInline.receiverPhone"
+                  placeholder="请输入买家电话"
+                  clearable
+                />
+              </el-form-item>
             </el-form>
           </div>
           <div class="search-bar-right">
@@ -357,9 +357,11 @@ const props = ref({
 });
 const formInline = reactive({
   orderNo: "",
-  orderStatus: 4,
+  orderStatus: "4",
   current: 1,
   size: 10,
+  receiverName: "",
+  receiverPhone: "",
 });
 // let reciveAddress = ref("");
 let formLabelAlign = reactive({
@@ -642,8 +644,8 @@ onBeforeUnmount(() => {
 <style lang="scss" scoped>
 .send-buttons-info {
   float: left;
-  width: 100px;
+  width: 150px;
-  text-align: left;
+  text-align: center;
   height: 25px;
   line-height: 25px;
   border-radius: 5px;