土工试验Lims

api/soil/soil-sample.js

@@ -200,5 +200,14 @@ export default {
   deleteBox: data => http.delete('soil/v1/box/?ids=' + data).then(res => res),
   editBox: data =>
     http.put('soil/v1/box/' + data.id, data.obj).then(res => res),
-  getByIdBox: data => http.get('soil/v1/box/' + data).then(res => res)
+  getByIdBox: data => http.get('soil/v1/box/' + data).then(res => res),
+  saveExcelOriginalRecord: data =>
+    http
+      .post(
+        'soil/v1/experiment/save_excel_original_record?ids=' +
+          data.ids +
+          '&templateId=' +
+          data.id
+      )
+      .then(res => res)
 }

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

@@ -6,21 +6,21 @@
         <Form id="task-assign-item-right" :label-width="70" inline onsubmit="return false">
           <label class="label-sign"></label>
           <Form-item class="search-item" label="试样编号:">
-            <Input @on-enter="_formSearch" v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable></Input>
+            <Input v-model="formObj.sampleCode" name="sampleCode" placeholder="请输入试样编号" clearable @on-enter="_formSearch"></Input>
           </Form-item>
           <Form-item class="search-btn">
-            <Button @click="_formSearch" type="primary">搜索</Button>
+            <Button type="primary" @click="_formSearch">搜索</Button>
           </Form-item>
         </Form>
       </Col>
       <!--操作-->
       <Col span="24">
-        <btn-list :msg="envPro?btnPro:btn" @on-result-change="_btnClick" class="contHide"></btn-list>
+        <btn-list :msg="envPro?btnPro:btn" class="contHide" @on-result-change="_btnClick"></btn-list>
       </Col>
       <!-- 表格 -->
       <Col span="24">
-        <PTVXETable ref="pageTable" :pageColumns="pageColumns" :tableHeight="tableHeight"
-                    @on-result-change="_tableResultChange" :getPage="getPage" :icon-msg="iconMsg" :table-name="tableName"  is-task select-data>
+        <PTVXETable ref="pageTable" :page-columns="pageColumns" :table-height="tableHeight"
+                    :get-page="getPage" :icon-msg="iconMsg" :table-name="tableName" is-task  select-data @on-result-change="_tableResultChange">
           <vxe-table-column
             v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
             :key="item.key"
@@ -42,8 +42,8 @@
               <span v-else>{{scope.row[item.key]}}</span>
             </template>
           </vxe-table-column>
-          <VXESettingCol slot="setting" :pageColumns="pageColumns" :userColumns="userColumns"
-                         @on-result-change="_resetColumn" :table-name="tableName"></VXESettingCol>
+          <VXESettingCol slot="setting" :page-columns="pageColumns" :user-columns="userColumns"
+                         :table-name="tableName" @on-result-change="_resetColumn"></VXESettingCol>
         </PTVXETable>
       </Col>
     </Row>
@@ -252,9 +252,11 @@ export default {
     },
     _makeCodeExcel: async function(data) {
       console.log(this.selectIds)
-      console.log('----dddd---', data)
       this.$refs.pageTable._hideLoading()
-      const result = await soilSample.generateExcelReport(data)
+      const result = await soilSample.saveExcelOriginalRecord({
+        ids: this.selectIds,
+        id: data.id
+      })
       if (result) {
         await this._page()
         if (result === null || result === undefined) {