瀏覽代碼

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

See999 4 年之前
父節點
當前提交
b286eda978
共有 3 個文件被更改,包括 21 次插入22 次删除
  1. 1 1
      src/api/his/his.js
  2. 15 16
      src/xt_pages/data/components/addInspection.vue
  3. 5 5
      src/xt_pages/data/components/editInspection.vue

+ 1 - 1
src/api/his/his.js 查看文件

21
 
21
 
22
 
22
 
23
 export function createCaseHistory(params) {
23
 export function createCaseHistory(params) {
24
-  console.log("params",params)
24
+  // console.log("params",params)
25
   return request({
25
   return request({
26
     url: "/api/doctorworkstation/casehistory/create",
26
     url: "/api/doctorworkstation/casehistory/create",
27
     method: "get",
27
     method: "get",

+ 15 - 16
src/xt_pages/data/components/addInspection.vue 查看文件

251
             }
251
             }
252
          }
252
          }
253
          console.log("33333",this.tableData)
253
          console.log("33333",this.tableData)
254
-        //  this.tableData = []
255
-        //  this.tableData = this.tabList
254
+      
256
          
255
          
257
        
256
        
258
-        //     const params = {
259
-        //       id:this.form.project_detail,
260
-        //       number:parseInt(this.form.number)
261
-        //     }
262
-        //    console.log("params",params)
263
-        //   addProjectList(params).then(response=>{
264
-        //      if(response.data.state == 1){
265
-        //        var projectList = response.data.data.projectList
266
-        //        this.$message.success("保存成功")
267
-        //        this.form.project_detail = ""
268
-        //        this.form.number = ""
269
-        //        this.getlist()
270
-        //      }
271
-        //   })
257
+            const params = {
258
+              id:this.form.project_detail,
259
+              number:parseInt(this.form.number)
260
+            }
261
+           console.log("params",params)
262
+          addProjectList(params).then(response=>{
263
+             if(response.data.state == 1){
264
+               var projectList = response.data.data.projectList
265
+               this.$message.success("保存成功")
266
+               this.form.project_detail = ""
267
+               this.form.number = ""
268
+            //    this.getlist()
269
+             }
270
+          })
272
         },
271
         },
273
         DeleteProject(id,index){
272
         DeleteProject(id,index){
274
            this.$confirm("确认删除此项目吗?", "删除", {
273
            this.$confirm("确认删除此项目吗?", "删除", {

+ 5 - 5
src/xt_pages/data/components/editInspection.vue 查看文件

190
                        }
190
                        }
191
                    }
191
                    }
192
                  }
192
                  }
193
+                 console.log("数据222222",list)
193
                  var strArr = []
194
                  var strArr = []
194
                  for(let i=0;i<arr.length;i++){
195
                  for(let i=0;i<arr.length;i++){
195
                    for(let j=0;j<list.length;j++){
196
                    for(let j=0;j<list.length;j++){
199
                    }
200
                    }
200
                  }
201
                  }
201
                  this.tableData = strArr
202
                  this.tableData = strArr
202
-                 console.log("str---",strArr)
203
+               
203
                
204
                
204
                  this.form.id = projectTeamDetail.id
205
                  this.form.id = projectTeamDetail.id
205
                  this.form.project_team = projectTeamDetail.project_team
206
                  this.form.project_team = projectTeamDetail.project_team
209
                  this.form.tube_color = projectTeamDetail.tube_color
210
                  this.form.tube_color = projectTeamDetail.tube_color
210
                  this.form.team_type = projectTeamDetail.team_type
211
                  this.form.team_type = projectTeamDetail.team_type
211
                  this.form.remark = projectTeamDetail.remark
212
                  this.form.remark = projectTeamDetail.remark
212
-                 console.log("project",projectTeamDetail)
213
+                //  console.log("project",projectTeamDetail)
213
               }
214
               }
214
            }) 
215
            }) 
215
         },
216
         },
219
                 for(let i=0;i<this.tableData.length;i++){
220
                 for(let i=0;i<this.tableData.length;i++){
220
                     arr.push(this.tableData[i].id)
221
                     arr.push(this.tableData[i].id)
221
                 }
222
                 }
222
-               console.log("arr",arr)
223
+             
223
                var ids = arr.join(",")
224
                var ids = arr.join(",")
224
                if(valid){
225
                if(valid){
225
                 var params = {
226
                 var params = {
233
                     remark:this.form.remark,
234
                     remark:this.form.remark,
234
                     ids:ids,
235
                     ids:ids,
235
                 }
236
                 }
236
-                console.log("params",params)
237
+                // console.log("params",params)
237
                  updatedProjectTeam(params).then(response=>{
238
                  updatedProjectTeam(params).then(response=>{
238
                    if(response.data.state == 1){
239
                    if(response.data.state == 1){
239
                      var projectTeam = response.data.data.projectTeam
240
                      var projectTeam = response.data.data.projectTeam
261
         getId(id){
262
         getId(id){
262
           var name = ""
263
           var name = ""
263
           var statistics_category =  getDictionaryDataConfig('system','statistics_category') 
264
           var statistics_category =  getDictionaryDataConfig('system','statistics_category') 
264
-          console.log("2235",statistics_category)
265
           for(let i=0;i<statistics_category.length;i++){
265
           for(let i=0;i<statistics_category.length;i++){
266
              if(id == statistics_category[i].id){
266
              if(id == statistics_category[i].id){
267
                  name = statistics_category[i].name
267
                  name = statistics_category[i].name