Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-cloud-service-soil-web into dev

api/soil/soil-entrust.js

@@ -81,6 +81,8 @@ export default {
     http.put(
       'soil/v1/sample/' + data.id + '?describeDetail=' + data.describeDetail
     ),
+  sampleRemarkEdit: data =>
+    http.put('soil/v1/sample/' + data.id + '?remark=' + data.remark),
   weiteSoilDetail: data =>
     http.post('soil/v1/sample/write_soil_detail', data).then(res => res),
   pageBackup: data =>

pages/soil-sample-manage/SoilSampleManage.vue

 <template>
   <div>
-    <Modal v-model="showModal" @on-visible-change="_visibleChange" width="970" class="modal-footer-none">
+    <Modal v-model="showModal" width="1200" class="modal-footer-none" @on-visible-change="_visibleChange">
       <p slot="header">
         {{ modalTitle }}
       </p>
@@ -9,13 +9,13 @@
         <Row>
           <!--查询-->
           <Col span="24">
-          <Form id="search-sample-company" v-show="searchOpen" :label-width="80" inline onsubmit="return false">
+          <Form v-show="searchOpen" id="search-sample-company" :label-width="80" inline onsubmit="return false">
             <label class="label-sign"></label>
             <Form-item label="试样编号:" class="search-item">
-              <Input v-model="formObj.sampleCode" @on-enter="_formSearch" placeholder="请输入样品编号" clearable />
+              <Input v-model="formObj.sampleCode" placeholder="请输入样品编号" clearable @on-enter="_formSearch" />
             </Form-item>
             <Form-item class="search-btn">
-              <Button @click="_page" type="primary">
+              <Button type="primary" @click="_page">
                 搜索
               </Button>
             </Form-item>
@@ -23,12 +23,12 @@
           </Col>
           <!--操作-->
           <Col span="24">
-          <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" class="contHide" show-search-btn="true"></btn-list>
+          <btn-list :msg="btn" :open="searchOpen" class="contHide" show-search-btn="true" @on-result-change="_btnClick"></btn-list>
           </Col>
           <!-- 表格 -->
           <Col span="24">
             <PTVXETableHeight ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
-                        :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" is-edit select-data>
+                        :get-page="getPage" :icon-msg="iconMsg" is-edit select-data @on-result-change="_tableResultChange">
               <vxe-table-column
                 v-for="item in pageColumns"
                 :key="item.key"
@@ -43,6 +43,9 @@
 <!--                    </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)">
+                    <el-input v-model="scope.row.remark" @blur="_page()" @change="_remarkChange(scope.row)"></el-input>
+                  </div>
                 </template>
               <template slot-scope="scope">
                 <div v-if="item.detail">
@@ -137,6 +140,12 @@ export default {
           width: 200,
           editCell: true
         },
+        {
+          title: '备注',
+          key: 'remark',
+          width: 200,
+          editCell: true
+        },
         { title: '样品包装类型', key: 'samplePack', width: 120 }
       ],
       sampleId: '',
@@ -170,6 +179,17 @@ export default {
         this.$Message.success('修改成功')
       }
     },
+
+    _remarkChange: async function(info) {
+      const result = await soilEntrust.sampleRemarkEdit({
+        id: info.id,
+        remark: info.remark
+      })
+      if (result) {
+        this._resultChange('修改成功')
+      }
+    },
+
     _handleRow(data) {
       this.currentRow = data.row
       this.currentIndex = data.rowIndex

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

@@ -29,13 +29,7 @@ export default {
   data() {
     return {
       formId: '',
-      lengthLimitList: [
-        { key: 'stdNum', title: '标准号' },
-        { key: 'enName', title: '英文名称' },
-        { key: 'belongUnit', title: '归口单位' },
-        { key: 'publishUnit', title: '发布单位' }
-      ],
-      modalTitle: '收样位置选择',
+      modalTitle: '土质描述详情填写',
       formObj: {
         detail: ''
       },
@@ -43,24 +37,6 @@ export default {
       showEditModal: false,
       ids: '',
       options: [],
-      classifyList: [
-        { value: 0, name: '判定依据' },
-        { value: 1, name: '检测依据' },
-        { value: 2, name: '其他' }
-      ],
-      typeList: [
-        { value: 0, name: '国家标准' },
-        { value: 1, name: '地方标准' },
-        { value: 2, name: '行业标准' },
-        { value: 3, name: '企业标准' }
-      ],
-      statusList: [
-        { value: 0, name: '现行' },
-        { value: 1, name: '即将实施' },
-        { value: 2, name: '部分被代替' },
-        { value: 3, name: '被代替' },
-        { value: 4, name: '作废' }
-      ],
       footerList: [
         { id: '', name: '取消', type: '' },
         { id: '', name: '保存', type: 'primary' }