Merge branch 'master' of https://code.siemens.com/cs-psm-dig/siemens.emp.ui

src/views/record/index.vue

@@ -478,7 +478,14 @@
                   :trigger-on-focus="false"
                   @select="handleSelect"
                 /> -->
-                <el-select v-model="addStatusForm.costCenter" placeholder="请选择成本号">
+                <el-select
+                  v-model="addStatusForm.costCenter"
+                  placeholder="请选择成本号"
+                  clearable
+                  filterable
+                  allow-create
+                  @blur="InsertCostCenterSelect"
+                >
                   <el-option
                     v-for="(item, index) in costList"
                     :key="index"
@@ -620,7 +627,14 @@
                   :trigger-on-focus="false"
                   @select="handleSelect"
                 /> -->
-                <el-select v-model="editStatusForm.workRecordsList[0].costCenter" placeholder="请选择成本号">
+                <el-select
+                  v-model="editStatusForm.workRecordsList[0].costCenter"
+                  placeholder="请选择成本号"
+                  clearable
+                  filterable
+                  allow-create
+                  @blur="EditCostCenterSelect"
+                >
                   <el-option
                     v-for="(item, index) in costList"
                     :key="index"
@@ -731,7 +745,14 @@
                     :trigger-on-focus="false"
                     @select="handleSelect"
                   /> -->
-                  <el-select v-model="editStatusForm.costCenterOfNewOrder" placeholder="请选择成本号">
+                  <el-select
+                    v-model="editStatusForm.costCenterOfNewOrder"
+                    placeholder="请选择成本号"
+                    clearable
+                    filterable
+                    allow-create
+                    @blur="EditNewCostCenterSelect"
+                  >
                     <el-option
                       v-for="(item, index) in costList"
                       :key="index"
@@ -1251,7 +1272,6 @@ export default {
       this.handleMonthLastDay()
       this.dayScreen()
       const { page, limit, departmentId } = this
-      console.log(this.departmentId + '++++++')
       var queryInfo = {
         page: this.page,
         limit: this.limit,
@@ -1260,6 +1280,7 @@ export default {
         reign: this.region.trim(),
         city: this.city.trim()
       }
+      console.log(this.departmentId)
       const resultOfSelectEngisByDept =
         await this.$API.user.reqGetUserPageWithSkills(queryInfo)// select.reqSelectEngisByDept(page, limit, departmentId)
       if (resultOfSelectEngisByDept.code === 0) {
@@ -1282,7 +1303,7 @@ export default {
           page,
           limit
         )
-
+      console.log(this.engiArray, resOfSelectEngiStatusByMap)
       if (resOfSelectEngiStatusByMap.code === 0) {
         var EngiStatusMap = resOfSelectEngiStatusByMap.data
         for (const i in EngiStatusMap) {
@@ -2138,6 +2159,25 @@ export default {
       }
 
       return dropdownData
+    },
+    InsertCostCenterSelect(e) {
+      const value = e.target.value // 输入框值
+      if (value) { // 你输入才有这个值 不为空，如果你下拉框选择的话 这个值为空
+        this.addStatusForm.costCenter = value
+      }
+    },
+    // cost center下拉框 失去焦点 自动
+    EditCostCenterSelect(e) {
+      const value = e.target.value // 输入框值
+      if (value) { // 你输入才有这个值 不为空，如果你下拉框选择的话 这个值为空
+        this.editStatusForm.workRecordsList[0].costCenter = value
+      }
+    },
+    EditNewCostCenterSelect(e) {
+      const value = e.target.value // 输入框值
+      if (value) { // 你输入才有这个值 不为空，如果你下拉框选择的话 这个值为空
+        this.editStatusForm.costCenterOfNewOrder = value
+      }
     }
   },
   watch: {

vue.config.js

@@ -39,6 +39,7 @@ module.exports = {
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
         target: 'http://139.219.4.195:8003',
+        // 测试地址
         // target: 'http://192.168.1.161:8003',
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''