v1.9 优化合同审核人无法选择问题

src/components/community/addCommunityWechat.vue

@@ -1,59 +1,25 @@
 <template>
-  <el-dialog 
-    :title="$t('addCommunityWechat.title')" 
-    :visible.sync="visible" 
-    width="50%"
-    @close="handleClose"
-  >
-    <el-form 
-      ref="form" 
-      :model="form" 
-      :rules="rules" 
-      label-width="120px"
-      label-position="right"
-    >
-      <el-form-item 
-        :label="$t('addCommunityWechat.name')" 
-        prop="name"
-      >
-        <el-input 
-          v-model="form.name" 
-          :placeholder="$t('addCommunityWechat.placeholder.name')"
-        />
+  <el-dialog :title="$t('addCommunityWechat.title')" :visible.sync="visible" width="50%" @close="handleClose">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="right">
+      <el-form-item :label="$t('addCommunityWechat.name')" prop="name">
+        <el-input v-model="form.name" :placeholder="$t('addCommunityWechat.placeholder.name')" />
       </el-form-item>
-      
+
       <el-form-item label="APPID" prop="appId">
-        <el-input 
-          v-model="form.appId" 
-          :placeholder="$t('addCommunityWechat.placeholder.appId')"
-        />
+        <el-input v-model="form.appId" :placeholder="$t('addCommunityWechat.placeholder.appId')" />
       </el-form-item>
-      
-      <el-form-item 
-        :label="$t('addCommunityWechat.appSecret')" 
-        prop="appSecret"
-      >
-        <el-input 
-          v-model="form.appSecret" 
-          type="password"
-          show-password
-          :placeholder="$t('addCommunityWechat.placeholder.appSecret')"
-        />
+
+      <el-form-item :label="$t('addCommunityWechat.appSecret')" prop="appSecret">
+        <el-input v-model="form.appSecret" type="password" show-password
+          :placeholder="$t('addCommunityWechat.placeholder.appSecret')" />
       </el-form-item>
-      
-      <el-form-item 
-        :label="$t('addCommunityWechat.description')" 
-        prop="remarks"
-      >
-        <el-input 
-          v-model="form.remarks" 
-          type="textarea"
-          :placeholder="$t('addCommunityWechat.placeholder.remarks')"
-          :rows="3"
-        />
+
+      <el-form-item :label="$t('addCommunityWechat.description')" prop="remarks">
+        <el-input v-model="form.remarks" type="textarea" :placeholder="$t('addCommunityWechat.placeholder.remarks')"
+          :rows="3" />
       </el-form-item>
     </el-form>
-    
+
     <div slot="footer" class="dialog-footer">
       <el-button @click="visible = false">
         {{ $t('communityWechat.cancel') }}

src/components/contract/purchaseApprovers.vue

@@ -1,6 +1,6 @@
 <template>
   <el-card class="box-card">
-    <div slot="header" class="clearfix">
+    <div slot="header" class="flex justify-between">
       <span>{{ $t('purchaseApprovers.title') }}</span>
     </div>
 
@@ -34,29 +34,27 @@
         </el-form-item>
       </el-form>
     </div>
+    <select-staff ref="selectStaff" @selectStaff="handleSelectStaff" />
+
   </el-card>
 </template>
 
 <script>
 import { getFirstStaff } from '@/api/contract/contractChangeDetailApi'
 import { getCommunityId } from '@/api/community/communityApi'
+import SelectStaff from '@/components/staff/SelectStaff'
 
 export default {
   name: 'PurchaseApprovers',
   props: {
-    callBackListener: {
-      type: String,
-      default: ''
-    },
-    callBackFunction: {
-      type: String,
-      default: ''
-    },
     flowType: {
       type: String,
       default: '60006'
     }
   },
+  components: {
+    SelectStaff
+  },
   data() {
     return {
       purchaseApproversInfo: {
@@ -117,8 +115,18 @@ export default {
         this.$emit(this.callBackListener, this.callBackFunction, this.purchaseApproversInfo)
       }
     },
+    handleSelectStaff(staff) {
+      this.purchaseApproversInfo.staffId = staff.userId
+      this.purchaseApproversInfo.staffName = staff.userName
+      this.$emit('notify3', {
+        staffId: staff.userId,
+        staffName: staff.userName
+      })
+
+    },
     chooseStaff() {
-      this.$emit('openSelectStaff', this.purchaseApproversInfo)
+      this.$refs.selectStaff.open(this.purchaseApproversInfo)
+
     }
   }
 }

src/views/community/communityMiniList.vue

@@ -7,7 +7,7 @@
 
       <el-col :span="20">
         <el-card>
-          <div slot="header" class="clearfix flex justify-between">
+          <div slot="header" class=" flex justify-between">
             <span>{{ $t('communityMini.title') }}</span>
             <div class="header-tools">
               <el-button v-if="smallWeChats.length === 0 && conditions.communityId" type="primary" size="small"

src/views/community/communityWechatLang.js

@@ -67,7 +67,7 @@ export const messages = {
       editSuccess: '修改成功'
     },
     addCommunityWechat: {
-      title: '添加公众号',
+      title: '添加',
       name: '名称',
       appId: 'APPID',
       appSecret: '应用密钥',

src/views/contract/addContractList.vue

@@ -182,7 +182,7 @@
 
     <!-- Related Rooms -->
     <el-card class="box-card" style="margin-top:20px">
-      <div slot="header" class="clearfix">
+      <div slot="header" class="flex justify-between">
         <span>{{ $t('contract.relatedRooms') }}</span>
         <el-button style="float: right; padding: 3px 0" type="text" @click="_selectRoom">
           <i class="el-icon-plus"></i>{{ $t('contract.add') }}

src/views/log/transactionOutLogList.vue

@@ -15,7 +15,7 @@
         <el-row>
           <el-col :span="24">
             <el-card>
-              <div slot="header">
+              <div slot="header" class="flex justify-between">
                 <span>{{ $t('transactionOutLog.queryCondition') }}</span>
               </div>
               <el-row :gutter="20">
@@ -40,7 +40,7 @@
         <el-row class="mt-20">
           <el-col :span="24">
             <el-card>
-              <div slot="header">
+              <div slot="header" class="flex justify-between">
                 <span>{{ $t('transactionOutLog.logTitle') }}</span>
               </div>
               <el-table :data="logs" border style="width: 100%">

src/views/mall/shopManageList.vue

@@ -11,8 +11,8 @@
             @keyup.enter.native="handleSearch" />
         </el-col>
         <el-col :span="6">
-          <el-select v-model="searchForm.storeType" style="width: 100%;" :placeholder="$t('shopManage.search.storeType')" clearable>
-            <el-option v-for="item in storeTypes" :key="item.statusCd" :label="item.name" :value="item.statusCd" />
+          <el-select v-model="searchForm.shopType" style="width: 100%;" :placeholder="$t('shopManage.search.storeType')" clearable>
+            <el-option v-for="item in shopTypes" :key="item.statusCd" :label="item.name" :value="item.statusCd" />
           </el-select>
         </el-col>
         <el-col :span="6">
@@ -60,7 +60,8 @@
 </template>
 
 <script>
-import { getShopList, getStoreTypes } from '@/api/mall/shopManageApi'
+import { getShopList } from '@/api/mall/shopManageApi'
+import {getDict} from '@/api/community/communityApi'
 import ShopWithdraw from '@/components/mall/ShopWithdraw'
 
 export default {
@@ -73,11 +74,11 @@ export default {
       loading: false,
       searchForm: {
         shopName: '',
-        storeType: '',
+        shopType: '',
         state: '',
         mallApiCode: 'queryShopsByAdminBmoImpl'
       },
-      storeTypes: [],
+      shopTypes: [],
       tableData: [],
       page: {
         current: 1,
@@ -87,7 +88,7 @@ export default {
     }
   },
   created() {
-    this.getStoreTypes()
+    this.getShopTypes()
     this.getList()
   },
   methods: {
@@ -108,12 +109,12 @@ export default {
         this.loading = false
       }
     },
-    async getStoreTypes() {
+    async getShopTypes() {
       try {
-        const data = await getStoreTypes()
-        this.storeTypes = data
+        const data = await getDict('s_shop','stop_type')
+        this.shopTypes = data
       } catch (error) {
-        this.$message.error(this.$t('shopManage.fetchStoreTypesError'))
+        this.$message.error(this.$t('shopManage.fetchShopTypesError'))
       }
     },
     handleSearch() {

src/views/oa/newOaWorkflowDetailList.vue

@@ -158,14 +158,16 @@
       </el-col>
     </el-row>
 
-    <select-staff ref="selectStaff" @selectStaff="handleSelectStaff"/>
+    <select-staff ref="selectStaff" @selectStaff="handleSelectStaff" />
   </div>
 </template>
 
 <script>
 import { getCommunityId } from '@/api/community/communityApi'
-import { queryOaWorkflowForm, queryOaWorkflowFormData, queryOaWorkflowUser, 
-  getNextTask, auditOaWorkflow, listRunWorkflowImage } from '@/api/oa/newOaWorkflowDetailApi'
+import {
+  queryOaWorkflowForm, queryOaWorkflowFormData, queryOaWorkflowUser,
+  getNextTask, auditOaWorkflow, listRunWorkflowImage
+} from '@/api/oa/newOaWorkflowDetailApi'
 import SelectStaff from '@/components/staff/SelectStaff'
 
 export default {

src/views/system/smallWeChatManageLang.js

@@ -35,8 +35,8 @@ export const messages = {
       name: '名称',
       appSecret: '应用密钥',
       remarks: '描述',
-      addTitle: '添加小程序',
-      editTitle: '修改小程序',
+      addTitle: '添加',
+      editTitle: '修改',
       deleteTitle: '请确认您的操作',
       deleteConfirm: '确定删除小程序管理吗?',
       namePlaceholder: '必填，请填写名称',