Merge branch 'release' into 'dev'

Release

See merge request !100

src/types/api/warehouse.ts

@@ -12,6 +12,7 @@ export interface warehouseSearchForm {
   warehouseSku?: string
   warehouseId?: number | string
   id?: number
+  remark?: string
 }
 export interface InterProductList {
   createTime?: string

src/views/logistics/shippingAddress.vue

@@ -355,6 +355,14 @@ const formConfig = computed<IFormConfig[]>(() => [
     type: 'switch',
     label: '是否默认',
   },
+  {
+    prop: 'creditCode',
+    type: 'input',
+    label: '社会信用代码',
+    attrs: {
+      placeholder: '请输入社会信用代码',
+    },
+  },
 ])
 
 async function getCountryList() {

src/views/warehouse/issueDoc.vue

@@ -87,6 +87,14 @@
                     style="width: 160px"
                   />
                 </ElFormItem>
+                <ElFormItem style="margin-right: 10px" label="备注">
+                  <ElInput
+                    v-model.trim="searchForm.remark"
+                    clearable
+                    placeholder="请输入备注"
+                    style="width: 160px"
+                  />
+                </ElFormItem>
                 <ElFormItem>
                   <ElButton type="primary" @click="search" ref="searchBtnRef"
                     >查询</ElButton
@@ -244,6 +252,20 @@
                     align="center"
                   ></ElTableColumn>
                   <ElTableColumn
+                    label="创建时间"
+                    show-overflow-tooltip
+                    prop="createTime"
+                    header-align="center"
+                    align="center"
+                  ></ElTableColumn>
+                  <ElTableColumn
+                    label="审核时间"
+                    show-overflow-tooltip
+                    prop="auditTime"
+                    header-align="center"
+                    align="center"
+                  ></ElTableColumn>
+                  <ElTableColumn
                     label="备注"
                     show-overflow-tooltip
                     prop="remark"