修改了原始记录模板配置

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

@@ -58,7 +58,8 @@ export default {
         { title: '列位置', key: 'columnPlace', width: 120 },
         { title: '合并开始列', key: 'mergeBegin', width: 120 },
         { title: '合并结束列', key: 'mergeEnd', width: 120 },
-        { title: '合并行数', key: 'mergeRowNum', width: 120 }
+        { title: '合并行数', key: 'mergeRowNum', width: 120 },
+        { title: '单位', key: 'unit', width: 120 }
       ],
       getPage: {},
       iconMsg: [{ type: 'md-create', id: '', name: '编辑' }],

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

@@ -52,11 +52,12 @@
                 <Form-item label="合并行数" prop="mergeRowNum" class="width-48">
                   <el-input
                     v-model="formObj.mergeRowNum"
+                    @input="inputChange()"
                     @keydown.native="channelInputLimit"
                     name="mergeRowNum"
                     type="number"
                     onmousewheel="return false"
-                    placeholder="请输入合并结束列"
+                    placeholder="请输入合并行数"
                   />
                 </Form-item>
                 <Form-item label="是否是项目指标" prop="itemed" class="width-48">
@@ -69,6 +70,10 @@
                     />
                   </el-select>
                 </Form-item>
+                <Form-item label="单位" prop="unit" class="width-48">
+                  <Input v-model="formObj.unit" name="unit"
+                         placeholder="请输入单位"/>
+                </Form-item>
               </div>
         </Form>
       </div>
@@ -169,6 +174,9 @@ export default {
       }
       return true
     },
+    inputChange(data) {
+      console.log(data)
+    },
     _selectJudgeType(data) {
       this.formObj.microbed = data
     },

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

@@ -100,28 +100,8 @@ export default {
       btn: [{ id: 'food-report-make-batch-down', name: '下载' }],
       getPage: {},
       pageColumns: [
-        { title: '报告编号', key: 'reportSn', width: 180, fixed: 'left' },
-        { title: '样品编号', key: 'sampleNum', width: 180 },
-        { title: '样品名称', key: 'sampleName', width: 160 },
-        { title: '是否合格', key: 'notOkCount', width: 120, notOkCount: true },
-        { title: '信息维护状态', key: 'infoMaintain', width: 130 },
-        { title: '应出报告日期', key: 'reportDate', width: 120, date: true },
-        { title: '是否判定', key: 'judge', width: 100, judge: true },
-        { title: '已盖章', key: 'signStatus', width: 100 },
-        { title: '盖章类型', key: 'signType', width: 180 },
-        { title: '所需资质', key: 'aptitudeType', width: 180 },
-        { title: '报告类别', key: 'reportClass', width: 120 },
-        { title: '大类', key: 'firstClass', width: 130 },
-        { title: '细类', key: 'detectType', width: 120 },
-        { title: '任务来源', key: 'taskSource', width: 120 },
-        { title: '已推国抽', key: 'dataPushed', width: 150, judge: true },
-        { title: '报告语言', key: 'reportType', width: 120 },
-        { title: '报告要求', key: 'reportRequire', width: 120 },
-        { title: '是否带照片', key: 'havePhoto', width: 120, judge: true },
-        { title: '编制人', key: 'maker', width: 100 },
-        { title: '编制时间', key: 'makDate', width: 140, dateTime: true },
-        { title: '样品备注', key: 'sampleRemark' },
-        { title: '委托备注', key: 'contractRemark' }
+        { title: '创建人', key: 'uname', width: 180, fixed: 'left' },
+        { title: '创建时间', key: 'ctime', width: 180, dateTime: true }
       ],
       selectIds: [],
       selectData: [],
@@ -297,7 +277,7 @@ export default {
     },
     _open(entrustId) {
       this.formObj = this.$resetFields(this.formObj)
-      this.formObj.contractId = entrustId
+      this.formObj.entrustId = entrustId
       this.showIssueModal = false
       this._page()
     },