wangziqian il y a 4 ans
Parent
commit
324318c02a

+ 1 - 1
src/utils/request.js

@@ -7,7 +7,7 @@ import { message } from '@/utils/mesDebounce'
 
 // create an axios instance
 const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
+  baseURL: '/apis', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 5000, // request timeout
   withCredentials: true

+ 12 - 27
src/views/projectManage/requirement/list/create.vue

@@ -238,9 +238,9 @@ export default {
             this.form.source = 1
           }
           const rqmtProposer = JSON.parse(JSON.stringify(this.form.rqmtProposer))
-          if (rqmtProposer[0] === '') {
+          if (rqmtProposer && rqmtProposer[0] === '') {
             this.form.rqmtProposer = null
-          } else {
+          } else if (rqmtProposer) {
             this.form.rqmtProposer = this.form.rqmtProposer.split(',')
           }
           this.init()
@@ -323,7 +323,7 @@ export default {
       this.isVisible = false
     },
     confirm: function() {
-      this.$refs.form.validate((valid) => {
+      this.$refs.form.validate(async(valid) => {
         if (valid) {
           for (const i in this.form) {
             if (!this.form[i]) {
@@ -364,31 +364,16 @@ export default {
           this.form.rqmtProposer = this.form.rqmtProposer.length ? this.form.rqmtProposer.join() : null
           this.form.referredClientType = this.form.referredClientType ? this.form.referredClientType.join() : null
           if (this.title === '新建需求') {
-            // let data = {}
-            // data = this.form
-            // data.rqmtProposer = data.rqmtProposer ? this.form.rqmtProposer.join() : null
-            // data.referredClientType = data.referredClientType === null || data.referredClientType === '' || typeof (data.referredClientType) === Array ? null : this.form.referredClientType.join()
-            createRequirement(this.form)
-              .then(res => {
-                if (res.code === 200) {
-                  this.$emit('confirm', this.form)
-                } else {
-                  this.$message.warning(res.msg)
-                }
-              })
+            const res = await createRequirement(this.form)
+            if (res.code === 200) this.$emit('confirm', this.form)
           } else {
-            // let data = {}
-            // data = this.form
-            // data.rqmtProposer = data.rqmtProposer ? this.form.rqmtProposer.join() : null
-            // data.referredClientType = this.form.referredClientType.join()
-            updateRequirement(this.form)
-              .then(res => {
-                if (res.code === 200) {
-                  this.$emit('confirm', this.form)
-                } else {
-                  this.$message.warning(res.msg)
-                }
-              })
+            const params = {
+              ...this.form,
+              rdLeader: null,
+              qaLeader: null
+            }
+            const res = await updateRequirement(params)
+            if (res.code === 200) this.$emit('confirm', this.form)
           }
         }
       })

+ 2 - 3
src/views/projectManage/requirement/requirementDetail.vue

@@ -305,7 +305,7 @@
         @childValInput="childVal"
         @click.stop
       />
-      <timeStatist v-if="dialogStatusVisible" :visible.sync="dialogStatusVisible" :status="status_dialong" :personnel="from_data" @updata="init_status" />
+      <timeStatist v-if="dialogStatusVisible" :visible.sync="dialogStatusVisible" :status="status_dialong" :personnel="form_query" @updata="init_status" />
     </el-container>
   </div>
 </template>
@@ -561,8 +561,7 @@ export default {
     async getRequirementById() { // 获取需求详情
       const res = await getRequirementById({ id: this.$route.query.id })
       if (res.code === 200) {
-        this.form_query = res.data
-        this.from_data = _.cloneDeep(res.data)
+        this.form_query = _.cloneDeep(res.data)
         if (this.form_query.rdLeader === null || this.form_query.rdLeader === '') {
           this.$set(this.form_query, 'rdLeader', [])
         } else {

+ 3 - 3
vue.config.js

@@ -24,11 +24,11 @@ module.exports = {
       errors: true
     },
     proxy: {
-      [process.env.VUE_APP_BASE_API]: {
-        target: `http://127.0.0.1:${port}/mock`,
+      '/apis': {
+        target: `http://zhihui-test.intra.xiaojukeji.com`,
         changeOrigin: true,
         pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
+          '^/apis': '' // 需要rewrite的,
         }
       }
     }