From 187c7ab147886b060d4b3c9202c9964568be2d6f Mon Sep 17 00:00:00 2001
From: woody <woody@gmail.com>
Date: Mon, 12 May 2025 15:12:09 +0800
Subject: [PATCH] =?UTF-8?q?feat(commodity):=20=E5=95=86=E5=93=81=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=92=8C=E7=AD=9B=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/logistics/commodity/index.vue | 145 ++++++++++--------------
 1 file changed, 59 insertions(+), 86 deletions(-)

diff --git a/src/views/logistics/commodity/index.vue b/src/views/logistics/commodity/index.vue
index aaa318c..36b22e0 100644
--- a/src/views/logistics/commodity/index.vue
+++ b/src/views/logistics/commodity/index.vue
@@ -111,80 +111,67 @@
         </el-row>
         <el-collapse-transition>
           <div v-show="isActive">
-            <el-row>
-              <el-col :span="4">
-                <el-form-item :label="$t('系统类型')">
-                  <el-select v-model="queryParams.systemType" clearable>
-                    <el-option
-                      v-for="item in systemTypes"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="4">
-                <el-form-item :label="'支付方式'" prop="payType">
-                  <el-select
-                    v-model="queryParams.payType"
-                    clearable
-                    :placeholder="'请选择'"
-                  >
-                    <el-option
-                      v-for="(item, index) in paywayList"
-                      :key="index"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item :label="'创建日期'" prop="teamCode">
-                  <el-date-picker
-                    v-model="queryParams.cjsj"
-                    type="daterange"
-                    range-separator="——"
-                    :start-placeholder="'开始日期'"
-                    :end-placeholder="'结束日期'"
-                    value-format="yyyy-MM-dd"
-                    :unlink-panels="true"
-                    @change="changeCjsj"
+            <el-col :span="4">
+              <el-form-item :label="'支付方式'" prop="payType">
+                <el-select
+                  v-model="queryParams.payType"
+                  clearable
+                  :placeholder="'请选择'"
+                >
+                  <el-option
+                    v-for="(item, index) in paywayList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
                   />
-                </el-form-item>
-              </el-col>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="'创建日期'" prop="teamCode">
+                <el-date-picker
+                  v-model="queryParams.cjsj"
+                  type="daterange"
+                  range-separator="——"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  value-format="yyyy-MM-dd"
+                  :unlink-panels="true"
+                  @change="changeCjsj"
+                />
+              </el-form-item>
+            </el-col>
 
-              <el-col :span="8">
-                <el-form-item :label="'支付日期'" prop="teamCode">
-                  <el-date-picker
-                    v-model="queryParams.zfsj"
-                    type="daterange"
-                    range-separator="——"
-                    :start-placeholder="'开始日期'"
-                    :end-placeholder="'结束日期'"
-                    value-format="yyyy-MM-dd"
-                    :unlink-panels="true"
-                    @change="changeZfsj"
+            <el-col :span="8">
+              <el-form-item :label="'支付日期'" prop="teamCode">
+                <el-date-picker
+                  v-model="queryParams.zfsj"
+                  type="daterange"
+                  range-separator="——"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  value-format="yyyy-MM-dd"
+                  :unlink-panels="true"
+                  @change="changeZfsj"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="订单状态" prop="orderStatus">
+                <el-select
+                  v-model="queryParams.orderStatus"
+                  clearable
+                  placeholder="请选择订单状态"
+                >
+                  <el-option
+                    v-for="(item, index) in orderStatusList"
+                    :key="index"
+                    :label="item.label"
+                    :value="item.value"
                   />
-                </el-form-item>
-              </el-col>
-              <el-col :span="4">
-                <el-form-item label="订单状态" prop="orderStatus">
-                  <el-select
-                    v-model="queryParams.orderStatus"
-                    clearable
-                    placeholder="请选择订单状态"
-                  >
-                    <el-option
-                      v-for="(item, index) in orderStatusList"
-                      :key="index"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
+                </el-select>
+              </el-form-item>
+            </el-col>
             </el-row>
           </div>
         </el-collapse-transition>
@@ -365,21 +352,7 @@
             prop="remark"
             :label="'备注'"
           />
-          <el-table-column
-            align="center"
-            prop="systemType"
-            :label="$t('系统类型')"
-          >
-            <template slot-scope="scope">
-              <div
-                v-for="item in systemTypes"
-                v-if="scope.row.systemType == item.value"
-                :key="item.value"
-              >
-                {{ item.label }}
-              </div>
-            </template>
-          </el-table-column>
+
           <el-table-column
             v-if="dataList[17].key"
             min-width="160px"