土工试验Lims

api/soil/soil-test.js

@@ -154,6 +154,8 @@ export default {
     http.delete('soil/v1/original_record/?ids=' + data).then(res => res),
   expReportPage: data =>
     http.post('soil/v1/exp_report/page', data).then(res => res),
+  pageExperimentReport: data =>
+    http.post('soil/v1/exp_report/page', data).then(res => res),
   deleteReport: data =>
     http.delete('soil/v1/exp_report/?ids=' + data).then(res => res)
 }

components/base/TwoColumnPage.vue

@@ -33,16 +33,16 @@ export default {
   data() {
     return {
       isTree: true,
-      leftSpan: 9,
-      rightSpan: 15
+      leftSpan: 8,
+      rightSpan: 16
     }
   },
   methods: {
     _treeHide() {
       this.isTree = !this.isTree
       if (this.isTree) {
-        this.leftSpan = 9
-        this.rightSpan = 15
+        this.leftSpan = 8
+        this.rightSpan = 16
       } else {
         this.leftSpan = 0
         this.rightSpan = 24

pages/soil-report-manage/report-make/SampleByMakeModal.vue

@@ -8,7 +8,7 @@
           <el-tab-pane label="样品台账" name="sample">
             <ReportMakeBySample ref="sampleTabs" @on-result-change="_sampleTabResult"></ReportMakeBySample>
           </el-tab-pane>
-          <el-tab-pane label="报告台账" name="report">
+          <el-tab-pane label="试验项目报告台账" name="report">
             <ReportInfoMake ref="reportTabs"></ReportInfoMake>
           </el-tab-pane>
         </el-tabs>

pages/soil-report-manage/report-make/tabs/ReportInfoMake.vue

@@ -101,6 +101,7 @@ export default {
       btn: [{ id: 'food-report-make-batch-down', name: '下载' }],
       getPage: {},
       pageColumns: [
+        { title: '试验项目', key: 'expName', width: 180, fixed: 'left' },
         { title: '创建人', key: 'uname', width: 180, fixed: 'left' },
         { title: '创建时间', key: 'ctime', width: 180, dateTime: true }
       ],
@@ -326,7 +327,7 @@ export default {
     },
     _page: async function() {
       Object.assign(this.formObj, this.$refs.pageTable._searchParams())
-      const result = await soilTest.expReportPage(
+      const result = await soilTest.pageExperimentReport(
         this.$serializeForm(this.formObj)
       )
       if (result) {

pages/soil-report-manage/report-make/tabs/ReportMakeByEntrust.vue

@@ -77,14 +77,8 @@
       </div>
     </div>
     <keep-alive>
-      <!-- eslint-disable-next-line vue/require-component-is -->
       <component ref="refModal" :is="currentComponent" @on-result-change="_componentResult"></component>
     </keep-alive>
-<!--    <SampleByMakeModal ref="sampleByMakeModal"></SampleByMakeModal>-->
-<!--    <Operation ref="operation"></Operation>-->
-<!--    <FileManage ref="FileManage"></FileManage>-->
-<!--    <OriginalRecordView ref="originalRecordView" @on-result-change="_page"></OriginalRecordView>-->
-<!--    <UploadByReport ref="uploadReport" @on-result-change="_page"></UploadByReport>-->
   </div>
 </template>
 <script>

pages/soil-test-manage/test-input/SampleManage.vue

 <template>
   <div>
-    <Modal v-model="showSampleModal" v-drag width="1200"  class="zIndex-900 modal-footer-none"
+    <Modal v-model="showSampleModal" v-drag width="1330"  class="zIndex-900 modal-footer-none"
            @on-visible-change="_visibleChange">
       <p slot="header"> {{name}}--管理样品</p>
       <div>

pages/soil-test-manage/test-input/item-tabs/ItemLeftList.vue

@@ -71,11 +71,7 @@ export default {
       iconMsg: [{ type: 'ios-book', id: '', name: '生成项目报告' }],
       id: '',
       selectId: '',
-      pageColumns: [
-        { title: '检测项目', key: 'name', width: 120 },
-        { title: '检测方法', key: 'testMethod', width: 140 },
-        { title: '检测依据名称', key: 'testBasisName', width: 200 }
-      ]
+      pageColumns: [{ title: '检测项目', key: 'name', width: 120 }]
     }
   },
   computed: {

pages/soil-test-manage/test-input/item-tabs/ItemRightList.vue

@@ -144,16 +144,16 @@ export default {
       getPage: {},
       pageColumns: [
         { title: '试验项目', key: 'name', width: 120, fixed: 'left' },
-        { title: '试样编号', key: 'sampleCode', width: 180 },
-        { title: '是否填写原始记录', key: 'recorded', width: 180 },
-        { title: '试样深度', key: 'sampleDepth', width: 180 },
-        { title: '试样包装类型', key: 'samplePack', width: 180 },
+        { title: '试样编号', key: 'sampleCode', width: 150 },
+        { title: '原始记录填写', key: 'recorded', width: 120 },
+        { title: '试样深度', key: 'sampleDepth', width: 110 },
+        { title: '检测方法', key: 'testMethod', width: 140 },
+        { title: '检测依据', key: 'testBasis', width: 140 },
+        { title: '试样包装类型', key: 'samplePack', width: 160 },
+        { title: '检测科室', key: 'groupName', width: 150 },
         { title: '状态', key: 'progress', width: 180 },
         { title: '大类', key: 'mainType', width: 140 },
-        { title: '小类', key: 'smallType', width: 140 },
-        { title: '检测方法', key: 'testMethod', width: 260 },
-        { title: '检测依据', key: 'testBasis', width: 140 },
-        { title: '检测科室', key: 'groupName', width: 150 }
+        { title: '小类', key: 'smallType', width: 140 }
       ],
       leftSelectData: {},
       selectIds: [], // 检测项目id