页面处理，加入商家ID、地店铺、展示药师签名

src/api/hisStore/city.js

@@ -10,7 +10,7 @@ export function listCity(query) {
 }
 export function getAllList(query) {
   return request({
-    url: '/store/city/getAllList',
+    url: '/his/city/getAllList',
     method: 'get',
     params: query
   })

src/views/hisStore/components/productAfterSalesOrder.vue

@@ -193,6 +193,12 @@
           <el-descriptions-item label="店铺名称" >
             <span>{{store.storeName}}</span>
           </el-descriptions-item>
+          <el-descriptions-item label="商家ID" >
+            <span>{{store.merchantId}}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="店铺ID" >
+            <span>{{store.storeSeq}}</span>
+          </el-descriptions-item>
           <el-descriptions-item label="店铺介绍" >
             <span>{{store.descs}}</span>
           </el-descriptions-item>

src/views/hisStore/components/productOrder.vue

@@ -299,6 +299,12 @@
           <el-descriptions-item label="店铺名称" >
             <span>{{storeScrm.storeName}}</span>
           </el-descriptions-item>
+          <el-descriptions-item label="商家ID" >
+            <span>{{storeScrm.merchantId}}</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="店铺ID" >
+            <span>{{storeScrm.storeSeq}}</span>
+          </el-descriptions-item>
           <el-descriptions-item label="店铺介绍" >
             <span>{{storeScrm.descs}}</span>
           </el-descriptions-item>

src/views/hisStore/components/storeDetails.vue

@@ -216,7 +216,21 @@
       <el-table :data="item.doctorList" border>
         <el-table-column label="药师名称" align="center" prop="doctorName" />
         <el-table-column label="职业证书编号" align="center" prop="practiseCode" />
-        <el-table-column label="图片" align="center" width="200">
+        <el-table-column label="药师签名" align="center" width="200">
+          <template slot-scope="scope">
+            <div v-if="scope.row.signUrl" style="display: flex; gap: 10px; flex-wrap: wrap;">
+              <el-image
+                v-for="(img, index) in scope.row.signUrl.split(',')"
+                :key="index"
+                style="width: 100px; height: 100px; object-fit: contain;"
+                :src="img"
+                :preview-src-list="scope.row.signUrl.split(',')"
+              />
+            </div>
+            <span v-else>无图片</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="证书" align="center" width="200">
           <template slot-scope="scope">
             <div v-if="scope.row.practiseImages" style="display: flex; gap: 10px; flex-wrap: wrap;">
               <el-image

src/views/hisStore/shippingTemplates/index.vue

@@ -1,5 +1,21 @@
 <template>
   <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="模板名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入模板名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">

src/views/hisStore/store/audit.vue

@@ -92,8 +92,8 @@
     <el-table v-loading="loading" border :data="storeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="店铺id" align="center" prop="storeId" width="120px"/>-->
-      <el-table-column label="商家Id" align="center" prop="merchantId"  width="150px"/>
-      <el-table-column label="店铺Id" align="center" prop="storeSeq"  width="150px"/>
+      <el-table-column label="商家ID" align="center" prop="merchantId"  width="150px"/>
+      <el-table-column label="店铺ID" align="center" prop="storeSeq"  width="150px"/>
       <el-table-column label="店铺名称" align="center" prop="storeName" width="120px"/>
       <el-table-column label="店铺LOGO" align="center" prop="logoUrl" width="100px">
         <template slot-scope="scope">

src/views/hisStore/store/index.vue

@@ -131,8 +131,8 @@
     <el-table v-loading="loading" border :data="storeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="店铺id" align="center" prop="storeId" width="120px"/>-->
-      <el-table-column label="商家Id" align="center" prop="merchantId"  width="150px"/>
-      <el-table-column label="店铺Id" align="center" prop="storeSeq"  width="150px"/>
+        <el-table-column label="商家ID" align="center" prop="merchantId"  width="150px"/>
+      <el-table-column label="店铺ID" align="center" prop="storeSeq"  width="150px"/>
       <el-table-column label="店铺名称" align="center" prop="storeName" width="120px"/>
       <el-table-column label="机构全称" align="center" prop="fullName" width="120px"/>
       <el-table-column label="店铺LOGO" align="center" prop="logoUrl" width="100px">

src/views/hisStore/store/recommend.vue

@@ -1,6 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="商家ID" prop="storeId">
+        <el-input
+          v-model="queryParams.storeSeq"
+          placeholder="请输入商家ID"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="店铺ID" prop="storeId">
         <el-input
           v-model="queryParams.storeSeq"
@@ -88,7 +97,7 @@
     <el-table v-loading="loading" border :data="recommendScrmList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="ID" align="center" prop="id" />-->
-      <el-table-column label="店铺ID" align="center" prop="storeSeq" />
+      <el-table-column label="商家ID" align="center" prop="merchantId" />
       <el-table-column label="推荐店铺ID" align="center" prop="storeSeq" />
       <el-table-column label="推荐店铺名称" align="center" prop="storeName" />
       <el-table-column label="排序" align="center" prop="sortOrder" />

src/views/hisStore/storeAfterSales/index.vue

@@ -178,6 +178,9 @@
     <el-table  height="500" border v-loading="loading" :data="storeAfterSalesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="id" />
+      <el-table-column label="店铺名称" align="center" prop="storeName" />
+      <el-table-column label="商家ID" align="center" prop="merchantId" />
+      <el-table-column label="店铺ID" align="center" prop="storeSeq" />
       <el-table-column label="所属公司" align="center" prop="companyName" />
       <el-table-column label="所属员工" align="center" prop="companyUserNickName" />
       <el-table-column label="订单单号" align="center" prop="orderCode" />
@@ -218,12 +221,6 @@
 
       <el-table-column label="提交时间" align="center" prop="createTime" />
 
-      <el-table-column label="店铺名称" align="center" prop="storeName" />
-
-      <el-table-column label="商家ID" align="center" prop="merchantId" />
-
-      <el-table-column label="店铺ID" align="center" prop="storeSeq" />
-
       <el-table-column label="操作" align="center" fixed="right" width="100px" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -295,6 +295,21 @@
     <el-table v-loading="loading" :data="storeOrderList" border height="500" @selection-change="handleSelectionChange">
       <el-table-column align="center" type="selection" width="55"/>
       <el-table-column align="center" label="订单号" prop="orderCode" width="200px"/>
+      <el-table-column align="center" label="店铺名称" prop="storeName" width="150px">
+        <template slot-scope="scope">
+          <span>{{ scope.row.storeName }} </span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="商家ID" prop="merchantId" width="150px">
+        <template slot-scope="scope">
+          <span>{{ scope.row.merchantId }} </span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="店铺ID" prop="storeSeq" width="150px">
+        <template slot-scope="scope">
+          <span>{{ scope.row.storeSeq }} </span>
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="用户昵称" prop="nickname" width="150px">
         <template slot-scope="scope">
           <span>{{ scope.row.nickname }} </span>
@@ -368,21 +383,6 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="店铺名称" prop="storeName" width="150px">
-        <template slot-scope="scope">
-          <span>{{ scope.row.storeName }} </span>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="商家ID" prop="merchantId" width="150px">
-        <template slot-scope="scope">
-          <span>{{ scope.row.merchantId }} </span>
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="店铺ID" prop="storeSeq" width="150px">
-        <template slot-scope="scope">
-          <span>{{ scope.row.storeSeq }} </span>
-        </template>
-      </el-table-column>
 
       <el-table-column align="center" fixed="right" label="操作" width="80px">
         <template slot-scope="scope">

src/views/hisStore/storeOrder/index.vue

@@ -298,6 +298,21 @@
     <el-table  height="500" border v-loading="loading" :data="storeOrderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="订单号" align="center" prop="orderCode" width="200px" />
+      <el-table-column label="店铺名称" align="center" prop="storeName" width="150px" >
+        <template slot-scope="scope">
+          <span>{{scope.row.storeName}} </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="商家ID" align="center" prop="merchantId" width="150px" >
+        <template slot-scope="scope">
+          <span>{{scope.row.merchantId}} </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="店铺ID" align="center" prop="storeSeq" width="150px" >
+        <template slot-scope="scope">
+          <span>{{scope.row.storeSeq}} </span>
+        </template>
+      </el-table-column>
       <el-table-column label="所属公司" align="center" prop="companyName" />
       <el-table-column label="所属员工" align="center" prop="companyUserNickName" />
       <el-table-column label="用户昵称" align="center" prop="nickname" width="150px" >
@@ -379,22 +394,6 @@
               <el-tag prop="status" v-for="(item, index) in deliveryPayStatusOptions"    v-if="scope.row.deliveryPayStatus==item.dictValue">{{item.dictLabel}}</el-tag>
           </template>
       </el-table-column>
-      <el-table-column label="店铺名称" align="center" prop="storeName" width="150px" >
-        <template slot-scope="scope">
-          <span>{{scope.row.storeName}} </span>
-        </template>
-      </el-table-column>
-      <el-table-column label="商家ID" align="center" prop="merchantId" width="150px" >
-        <template slot-scope="scope">
-          <span>{{scope.row.merchantId}} </span>
-        </template>
-      </el-table-column>
-      <el-table-column label="店铺ID" align="center" prop="storeSeq" width="150px" >
-        <template slot-scope="scope">
-          <span>{{scope.row.storeSeq}} </span>
-        </template>
-      </el-table-column>
-
       <el-table-column label="操作" fixed="right" width="80px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button