土工试验Lims

api/soil/soil-sample.js

@@ -33,6 +33,10 @@ export default {
     http
       .post('soil/v1/sample_backup/page_backup_handle_check', data)
       .then(res => res),
+  pageBackupHandleCheckHis: data =>
+    http
+      .post('soil/v1/sample_backup/page_backup_handle_check_his', data)
+      .then(res => res),
   // 样品处理审批通过
   disposalOk: data =>
     http.post('soil/v1/sample_backup/disposal_ok?ids=' + data).then(res => res),

pages/meter-aptitude/item-manage/ExperimentItemManage.vue

@@ -268,8 +268,8 @@ export default {
     // 导入
     _import() {
       const data = {
-        importUrl: '/meter/v1/aptitude/import_aptitude',
-        downloadUrl: '/soil/v1/excel/template/SoilEntrustImport',
+        importUrl: '/soil/v1/aptitude_exp/import_aptitude/',
+        downloadUrl: '/soil/v1/excel/template/SoilAptExpImport',
         title: '授权资质导入'
       }
       this.$refs.importModal._open(data, '授权资质导入')

pages/meter-entrust/SoilSampleItemManage.vue

@@ -142,6 +142,7 @@ export default {
       ],
       pageColumns: [
         { title: '试验名称', key: 'name', width: 160 },
+        { title: '试样编号', key: 'sampleCode', width: 160 },
         { title: '试验项目英文简写', key: 'shortName', width: 140 },
         { title: '试验科室', key: 'groupName', width: 140 },
         { title: '大类', key: 'mainType', width: 140 },

pages/meter-entrust/SoilSampleItemManageEdit.vue

@@ -95,7 +95,7 @@
 <!--                        :value="item.name"-->
 <!--                      />-->
 <!--                    </el-select>-->
-                    <AutoCompletes v-model="scope.row.groupName" :handle-obj="scope.row" :down-data="groupoptions"
+                    <AutoCompletes style="editable:false" v-model="scope.row.groupName" :handle-obj="scope.row" :down-data="groupoptions"
                                   @on-result-change="_selGroup" clearable
                                   placeholder="输入或选择试验室" show-key="name"></AutoCompletes>
                   </div>
@@ -143,6 +143,7 @@ export default {
       ],
       pageColumns: [
         { title: '试验名称', key: 'name', width: 160 },
+        { title: '试样编号', key: 'sampleCode', width: 160 },
         {
           title: '试验项目英文简写',
           key: 'shortName',

pages/meter-entrust/entrust-register/EntrustRegisterHis.vue

@@ -38,7 +38,7 @@
                 :fixed="item.fixed?item.fixed:undefined" sortable>
                 <template slot-scope="scope">
                   <span v-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'):''}}</span>
-                  <span v-if="item.status">{{scope.row[item.key].display}}</span>
+                  <span v-else-if="item.status">{{scope.row[item.key].display}}</span>
                   <span v-else>{{scope.row[item.key]}}</span>
                 </template>
               </vxe-table-column>

pages/soil-sample-manage/sample-preparation/SamplePreparation.vue

@@ -114,16 +114,6 @@ export default {
           id: '',
           name: '附件'
         },
-        // {
-        //   type: 'md-document',
-        //   id: '',
-        //   name: '导出委托单'
-        // },
-        {
-          type: 'md-remove-circle',
-          id: '',
-          name: '删除'
-        },
         {
           type: 'ios-clock',
           id: '',

pages/soil-sample-manage/sample-receive/ReceiveByEntrust.vue

@@ -105,7 +105,6 @@ export default {
         //   name: '编辑协议'
         // },
         { type: 'md-cloud', id: '', name: '附件' },
-        { type: 'md-trash', id: '', name: '删除' },
         {
           type: 'ios-clock',
           id: '',

pages/soil-sample-manage/sample-take/TakeByEntrust.vue

@@ -91,18 +91,7 @@ export default {
           id: '',
           name: '管理样品'
         },
-        // {
-        //   type: 'ios-list',
-        //   id: '',
-        //   name: '项目管理'
-        // },
-        // {
-        //   type: 'md-create',
-        //   id: '',
-        //   name: '编辑协议'
-        // },
         { type: 'md-cloud', id: '', name: '附件' },
-        { type: 'md-trash', id: '', name: '删除' },
         {
           type: 'ios-clock',
           id: '',