Merge branch 'dev'

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

@@ -11,7 +11,7 @@
 <!--          </el-tab-pane>-->
 <!--        </el-tabs>-->
         <el-tabs v-model="activeName" @tab-click="_changeTabs">
-          <el-tab-pane label="数据审核" name="check"></el-tab-pane>
+          <el-tab-pane label="报告编制" name="check"></el-tab-pane>
           <el-tab-pane label="历史任务" name="checkHis"></el-tab-pane>
         </el-tabs>
         <keep-alive>

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

@@ -286,10 +286,10 @@ export default {
       this.$nextTick(function() {
         switch (res) {
           case '管理样品和报告':
-            this.$refs.refModal._open(data.id)
+            this._sampleManage(data.id)
             break
           case '查看原始记录':
-            this.$refs.refModal._open(data.id)
+            this._viewRecord(data.id)
             break
           case '上传报告':
             this._uploadReport(data.id)
@@ -312,6 +312,18 @@ export default {
         }
       })
     },
+    _viewRecord(id) {
+      this.currentComponent = 'OriginalRecordView'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id)
+      })
+    },
+    _sampleManage(id) {
+      this.currentComponent = 'SampleByMakeModal'
+      this.$nextTick(() => {
+        this.$refs.refModal._open(id)
+      })
+    },
     _uploadReport(id) {
       this.currentComponent = 'UploadByReport'
       this.$nextTick(() => {
@@ -358,7 +370,7 @@ export default {
           }
           break
         case 'iconClick':
-          this._iconClick(data.name, data.rowData, data.componentName)
+          this._iconClick(data.name, data.rowData, data.currentComponent)
           break
         case 'changeSize':
           this._page()

pages/soil-sample-manage/SoilSampleManageHis.vue

@@ -43,12 +43,15 @@
                     <!--                    </el-input>-->
                     <Input :value="scope.row.describeDetail" @change.native="_inputChange($event.target.value,scope.row)"></Input>
                   </div>
-                  <div v-else-if="item.key==='remark'" @click.stop="_handleRow(scope)">
+                  <div v-if="item.key==='remark'" @click.stop="_handleRow(scope)">
                     <el-input v-model="scope.row.remark"  @change="_remarkChange(scope.row)"></el-input>
                   </div>
                 </template>
                 <template slot-scope="scope">
-                  <div v-if>
+                  <div v-if="item.status">
+                    {{ scope.row[item.key].display }}
+                  </div>
+                  <div v-else>
                     {{ scope.row[item.key] }}
                   </div>
                 </template>

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

@@ -183,7 +183,10 @@ export default {
           case '查看原始记录':
             console.log(data)
             if (data.recordId) {
-              this._viewRecord(data.recordId)
+              this.$refs.editModal._openWithType(
+                data.recordId,
+                'ENVTESTMAKEEDIT'
+              )
             } else {
               this.$Message.warning('未填写原始记录')
             }

pages/soil-test-manage/test-input/sample-tabs/SampleRightList.vue

@@ -55,6 +55,7 @@
     <SelEquip ref="selEquip" @on-result-change="_equipResult"></SelEquip>
     <IndexManage ref="indexModal" @on-result-change="_page"></IndexManage>
     <EquipManage ref="equipModal" @on-result-change="_page"></EquipManage>
+    <OriginalRecordEdit ref="editModal"></OriginalRecordEdit>
   </div>
 </template>
 <script>
@@ -65,13 +66,15 @@ import SelectOriTempRecord from '../SelectOriTempRecord'
 import SelEquip from '../../../../components/select-equip/SelEquip'
 import IndexManage from '../IndexManage'
 import EquipManage from '../EquipManage'
+import OriginalRecordEdit from '../OriginalRecordEdit'
 export default {
   components: {
     AssignPerson,
     SelectOriTempRecord,
     SelEquip,
     IndexManage,
-    EquipManage
+    EquipManage,
+    OriginalRecordEdit
   },
   data() {
     return {
@@ -486,7 +489,10 @@ export default {
           case '查看原始记录':
             console.log(data)
             if (data.recordId) {
-              this._viewRecord(data.recordId)
+              this.$refs.editModal._openWithType(
+                data.recordId,
+                'ENVTESTMAKEEDIT'
+              )
             } else {
               this.$Message.warning('未填写原始记录')
             }