修改了试验项目报告模板

api/soil/soil-aptitude.js

@@ -50,5 +50,18 @@ export default {
       .put('soil/v1/original_template/' + data.id, data.formObj)
       .then(res => res),
   originalTemplateGetById: data =>
-    http.get('soil/v1/original_template/' + data).then(res => res)
+    http.get('soil/v1/original_template/' + data).then(res => res),
+  // 试验项目分页列表
+  expReportTemplatePage: data =>
+    http.post('soil/v1/exp_report_template/page', data).then(res => res),
+  // 试验项目根据id查询信息
+  expReportTemplateGetById: data =>
+    http.get('soil/v1/exp_report_template/' + data).then(res => res),
+  // 试验项目模板编辑
+  expReportTemplateEdit: data =>
+    http
+      .put('soil/v1/exp_report_template/' + data.id, data.formObj)
+      .then(res => res),
+  expReportTemplateDelete: data =>
+    http.delete('soil/v1/exp_report_template/?ids=' + data).then(res => res)
 }

pages/soil-record-template-manage/SoilRecordTemplate.vue

@@ -157,6 +157,7 @@ export default {
     },
 
     _viewReport(data) {
+      console.log('getUserInfo', global.getUserInfo())
       // window.open(global.baseURL + '/print/v1/oos?key=' + objectKey+'&edit=true', '', 'height=' + (screen.availHeight - 50) + ',' +
       //   'width=' + (screen.availWidth - 10) + ',top=0,left=0,toolbar=no,menubar=no,scrollbars=auto,resizeable=no,' +
       //   'location=no,status=no')

pages/soil-report-manage/soil-item-report-template/SoilItemReportTemplate.vue

@@ -58,7 +58,7 @@ export default {
   data() {
     return {
       pageColumns: [
-        { title: '原始记录模板名称', key: 'alias' },
+        { title: '报告模板名称', key: 'alias' },
         { title: '类别', key: 'classType' },
         { title: '备注', key: 'remark' }
       ],
@@ -150,7 +150,7 @@ export default {
     },
 
     _lookReport: async function(data) {
-      const result = await soilAptitude.originalTemplateGetById(data.id)
+      const result = await soilAptitude.expReportTemplateGetById(data.id)
       if (result) {
         this._viewReport(result)
       }
@@ -175,7 +175,9 @@ export default {
     _page: async function() {
       console.log('page')
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      const result = await soilAptitude.originalTemplatePage(this.formObj)
+      const result = await soilAptitude.expReportTemplatePage(
+        this.$serializeForm(this.formObj)
+      )
       if (result) {
         this.$refs.pageTable._hideLoading()
         this.getPage = result
@@ -212,7 +214,7 @@ export default {
       })
     },
     _delete: async function(ids) {
-      const result = await soilAptitude.originalTemplateDeleteById(ids)
+      const result = await soilAptitude.expReportTemplateDelete(ids)
       if (result) {
         this._formSearch()
         this.$Message.success('删除成功！')
@@ -244,8 +246,9 @@ export default {
         case 'iconClick':
           this._iconClick(data.name, data.rowData)
           break
-        default:
+        case 'changeSize':
           this._page()
+          break
       }
     }
   }

pages/soil-report-manage/soil-item-report-template/SoilReportEdit.vue

@@ -18,8 +18,8 @@
                          :key="index"></el-option>
             </el-select>
           </Form-item>
-          <Form-item label="原始记录名称" prop="alias" style="width: 100%">
-            <Input v-model="formObj.alias" name="alias" placeholder="请输入原始记录名称"></Input>
+          <Form-item label="报告模板名称" prop="alias" style="width: 100%">
+            <Input v-model="formObj.alias" name="alias" placeholder="请输入报告模板名称"></Input>
           </Form-item>
           <Form-item label="备注" prop="remark" style="width: 100%">
             <Input v-model="formObj.remark" name="remark" placeholder="请输入备注"></Input>
@@ -245,7 +245,7 @@ export default {
       })
     },
     _editOk: async function() {
-      const result = await soilAptitude.originalTemplateEdit({
+      const result = await soilAptitude.expReportTemplateEdit({
         id: this.id,
         formObj: this.formObj
       })

pages/soil-report-manage/soil-item-report-template/SoilReportTemplateEdit.vue

@@ -18,8 +18,8 @@
                          :key="index"></el-option>
             </el-select>
           </Form-item>
-          <Form-item label="原始记录名称" prop="name">
-            <Input v-model="formObj.name" @on-keyup="_onKeyUp" name="name" placeholder="请输入原始记录名称"></Input>
+          <Form-item label="报告模板名称" prop="name">
+            <Input v-model="formObj.name" @on-keyup="_onKeyUp" name="name" placeholder="请输入报告模板名称"></Input>
           </Form-item>
           <Form-item label="备注" prop="remark">
             <Input v-model="formObj.remark" @on-keyup="_onKeyUp" name="remark" placeholder="请输入备注"></Input>
@@ -102,7 +102,7 @@ export default {
         this.isDisable = false
         this.action =
           global.baseURL +
-          '/soil/v1/original_template/upload_template/?name=' +
+          '/soil/v1/exp_report_template/upload_template/?name=' +
           this.formObj.name +
           '&remark=' +
           this.formObj.remark +

plugins/common.js

@@ -841,8 +841,7 @@ Vue.prototype.$openWindowModeless = function(data) {
     data.isReport +
     '&userId=' +
     global.getUserInfo().id +
-    '&companyId=' +
-    global.getUserInfo().companyId +
+    '&companyId=1304005330061996033' +
     '&userName=' +
     realname +
     '&idType=' +