Merge pull request '添加用户关联员工' (#144) from xuxiaoming into develop

Reviewed-on: http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front/pulls/144

build_prod.sh

@@ -15,6 +15,9 @@ PROD_3="10.11.3.207_9003"
 ZIP_NAME_1="${PROD_1}-${CUR_DATATIME}.zip"
 ZIP_NAME_2="${PROD_2}-${CUR_DATATIME}.zip"
 ZIP_NAME_3="${PROD_3}-${CUR_DATATIME}.zip"
+CP_TARGET_DIR="/Users/denny/Downloads/"
+echo "\033[35m 打包后输出目录为为${CP_TARGET_DIR} \033[0m"
+
 
 CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 echo "\033[32m 当前分支为 ${CURRENT_BRANCH} \033[0m"
@@ -25,37 +28,36 @@ echo "\033[32m 拉取develop最新数据 \033[0m"
 (git pull) >/dev/null 2>&1
 echo "\033[32m 拉取完成 \033[0m"
 
-echo "\033[32m 开始部署文件，现在进行打包  \033[0m"
-echo "\033[32m 打包10.11.12.27_9003 \033[0m"
+echo "\033[32m 现在进行打包  \033[0m"
+
+echo "\033[32m 打包${PROD_1} \033[0m"
 cd $PROJECT_DIR
 (yarn build:prod_1) >/dev/null 2>&1
 echo "\033[32m 打包完成 \033[0m"
 echo "\033[32m 开始压缩文件 \033[0m"
 cd $DIST_DIT
-zip -q -r "10.11.12.27_9003-"$ZIP_NAME ./
+zip -q -r $ZIP_NAME_1 ./
+echo "\033[32m 压缩完成，文件名  ${ZIP_NAME_1} \033[0m"
+cp ${DIST_DIT}${ZIP_NAME_1} ${CP_TARGET_DIR}${ZIP_NAME_1}
 
-echo "\033[32m 压缩完成，文件名  10.11.12.27_9003-${ZIP_NAME} \033[0m"
-cp ${DIST_DIT}"10.11.12.27_9003-"${ZIP_NAME} "/Users/denny/Downloads/10.11.12.27_9003-${ZIP_NAME}"
 
-echo "\033[32m 打包10.11.12.27_9001 \033[0m"
+echo "\033[32m 打包${PROD_2} \033[0m"
 (yarn build:prod_2) >/dev/null 2>&1
 echo "\033[32m 打包完成 \033[0m"
 echo "\033[32m 开始压缩文件 \033[0m"
 cd $DIST_DIT
-zip -q -r "10.11.12.27_9001-"$ZIP_NAME ./
+zip -q -r $ZIP_NAME_2 ./
+echo "\033[32m 压缩完成，文件名 ${ZIP_NAME_2} \033[0m"
+cp ${DIST_DIT}${ZIP_NAME_2} ${CP_TARGET_DIR}${ZIP_NAME_2}
 
-echo "\033[32m 压缩完成，文件名  10.11.12.27_9001_${ZIP_NAME} \033[0m"
-cp ${DIST_DIT}"10.11.12.27_9001-"${ZIP_NAME} "/Users/denny/Downloads/10.11.12.27_9001-${ZIP_NAME}"
-
-echo "\033[32m 打包10.11.3.207_9003 \033[0m"
+echo "\033[32m 打包${PROD_3} \033[0m"
 (yarn build:prod_3) >/dev/null 2>&1
 echo "\033[32m 打包完成 \033[0m"
 echo "\033[32m 开始压缩文件 \033[0m"
 cd $DIST_DIT
-zip -q -r "10.11.3.207_9003-"$ZIP_NAME ./
-
-echo "\033[32m 压缩完成，文件名  10.11.3.207_9003-${ZIP_NAME} \033[0m"
-cp ${DIST_DIT}"10.11.3.207_9003-"${ZIP_NAME} "/Users/denny/Downloads/10.11.3.207_9003-${ZIP_NAME}"
+zip -q -r $ZIP_NAME_3 ./
+echo "\033[32m 压缩完成，文件名 ${ZIP_NAME_3} \033[0m"
+cp ${DIST_DIT}${ZIP_NAME_3} ${CP_TARGET_DIR}${ZIP_NAME_3}
 
 
 

src/components/queryComponent/upload.vue

@@ -16,6 +16,7 @@
 </template>
 <script>
 import { bulkimportfile } from "@/server/api.js";
+import uploadTemplate from "./upload.vue";
 export default {
 	name: 'editField',
 	props: {

src/server/system/user.js

@@ -6,4 +6,6 @@ export const deleteUser = (params) => '/admin/base/user/deleteone/' + params //
 export const getUser = (params) => get('/admin/base/user/userinfo/' + params) // 查询单条用户
 export const uplateUser = (params) => put('/admin/base/user/updateone', params) // 修改用户
 export const addUser = (params) => post('/admin/base/user/insertone', params) // 新增用户
-export const getRoles = (params) => get('/admin/base/role/urole', params) // 获取所有的角色数据
+export const getRoles = (params) => get('/admin/base/role/urole', params) // 获取所有的角色数据
+
+export const getEmpInfo = () => get('/admin/common/empinfo/list') // 查询单条用户

src/views/system/user/addOrEdit.vue

@@ -46,6 +46,18 @@
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
+        <el-col :span="12">
+					<el-form-item label="关联员工" prop="User-CustCommissioner">
+						<el-select v-model="form['User-CustCommissioner']" placeholder="请选择" >
+							<el-option
+								v-for="item in custCommissionerOptions"
+								:key="item['FNumber']"
+								:label="item['FName']"
+								:value="item['FNumber']"
+							/>
+						</el-select>
+					</el-form-item>
+				</el-col>
 				<el-col :span="24">
 					<el-form-item label="备注">
 						<el-input v-model="form['User-Remark']" type="textarea" placeholder="请输入内容" />
@@ -62,7 +74,7 @@
 	</el-dialog>
 </template>
 <script>
-import { uplateUser, addUser, getRoles, getUser} from "@/server/system/user"
+import { uplateUser, addUser, getRoles, getUser,getEmpInfo} from "@/server/system/user"
 export default {
 	name: 'editField',
 	props: {
@@ -80,6 +92,7 @@ export default {
 	},
 	data() {
 		return {
+      custCommissionerOptions:[],
       roleOptions: [], // 角色选项
       statusOptions: [ // 状态数据字典
 				{ dictLabel: '正常', dictValue: '0' }, 
@@ -109,6 +122,7 @@ export default {
 				this.roleOptions = res.data || []
 			}
 		})
+    this.getEmpInfo()
 	},
 	methods: {
 		cancel() { // 取消按钮
@@ -121,6 +135,11 @@ export default {
 				}
 			})
 		},
+    getEmpInfo(){
+      getEmpInfo().then( ({data = []} ) => {
+        	this.custCommissionerOptions = data
+      })
+    },
 		submitForm() { // 提交按钮
 			this.$refs['form'].validate(valid => {
 				if (valid) {