zhangxc hace 6 años
padre
commit
cf1dede151

+ 1 - 1
src/api/diagBase.js

@@ -8,7 +8,7 @@ export default {
         return axios({
             method:'post',
             url:urls.exportDiagnosticAll,
-            param,
+            data: param,
             contentType: "application/vnd.ms-excel" ,
             responseType: 'blob'//必须添加,否则会乱码
         })

+ 4 - 1
src/components/diagBase/AddDiagBase.vue

@@ -248,7 +248,7 @@
         },
         exportDiagnosticAll(){
             const param = {
-                disId: ''+this.disId
+                diagnoseId: '53'
             }
             this.diagBaseVerifyData().then(() => {
                 console.log('param', param)
@@ -355,6 +355,9 @@
                 this.disFeatureList[index].code = value.replace(/[^\d.]/g,'')
             } else if(type==='FeatureStand') {
                 // this.disFeatureList[index].standard = value.replace(/[^\d.]/g,'')
+            } else if ( type === 'FormulaNumber') {
+                //计算公式只能输入以下内容: 任、一、二、三、四、五、六、七、八、九、十
+                this.disFormulaList[index].formula =  value.replace(/[^\u4EFB\u4E00\u4E8C\u4E09\u56DB\u4E94\u516D\u4E03\u516B\u4E5D\u53410-9\/\.+\(\)\(\)]/g,'').replace(/[\(]/g, '(').replace(/[\)]/g, ')')
             }
             // const item = this.selectedIndexList[index].indexDesc;
             // e.target.value = value.replace(/[^\d]/g,'');

+ 1 - 2
src/components/diagBase/DiagBase.vue

@@ -256,9 +256,8 @@ export default {
           }).catch(() => {});
         },
         showDelDialog(id){
-          console.log('this.filter.modifier', this.modifier)
           this.showConfirmDialog('是否删除该诊断依据?',()=>{
-            api.diagBaseDelete({id:id,modifier:this.modifier,isDeleted:'Y'}).then((res)=>{
+            api.diagBaseDelete({id:id,modifier:this.modifier,isDeleted:'Y',remark:''}).then((res)=>{
               if(res.data.code=='0'){
                 if(!this.searched){
                   //未点确认时清空搜索条件