修改了收样登记的来样登记页面

pages/soil-alone-sample/EntrustRegister.vue

@@ -123,6 +123,10 @@ export default {
         { title: '项目名称', key: 'projectName', width: 120 },
         { title: '项目负责人', key: 'projectLeader', width: 150, detail: true },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
+        { title: '深度', key: 'receiveDepth', width: 120 },
+        { title: '工程类型', key: 'projectType', width: 120 },
+        { title: '项目类型', key: 'itemType', width: 120 },
+        { title: '接收状态', key: 'receiveStatus', width: 120 },
         { title: '箱数', key: 'casesNum', width: 120 },
         { title: '登记日期', key: 'registTime', width: 120, date: true }
       ]

pages/soil-alone-sample/EntrustRegisterEdit.vue

@@ -28,6 +28,24 @@
           <Form-item label="箱数" prop="casesNum" class="width-48">
             <Input v-model="formObj.casesNum" name="casesNum" placeholder="请输入箱数"/>
           </Form-item>
+          <Form-item label="工程类型:" class="width-48">
+            <Select v-model="formObj.projectType" clearable name="projectType" placeholder="请选择工程类型">
+              <Option v-for="(item,index) in projectArray" :key="index" :value="item.name">{{item.name}}</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="项目类型:" class="width-48">
+            <Select v-model="formObj.itemType" clearable name="itemType" placeholder="请选择项目类型">
+              <Option v-for="(item,index) in itemArray" :key="index" :value="item.name">{{item.name}}</Option>
+            </Select>
+          </Form-item>
+          <Form-item label="深度:" class="width-48">
+            <Input v-model="formObj.receiveDepth" name="receiveDepth" placeholder="请输入深度"/>
+          </Form-item>
+          <Form-item label="接收状态:" class="width-48">
+            <Select v-model="formObj.receiveStatus" clearable name="receiveStatus"  placeholder="请选择接收状态">
+              <Option v-for="(item,index) in receiveArray" :key="index" :value="item.name">{{item.name}}</Option>
+            </Select>
+          </Form-item>
           <Form-item @click.native="_selectRegisterPerson" label="登记人" prop="registrant" class="width-48">
             <Input v-model="formObj.registrant" name="registrant" placeholder="请输入登记人"/>
           </Form-item>
@@ -86,6 +104,39 @@ export default {
       searchOpen: true,
       testedCityData: [],
       judgeType: [{ value: 1, name: '是' }, { value: 0, name: '否' }],
+      projectArray: [
+        {
+          name: '开发项目'
+        },
+        {
+          name: '井场项目'
+        },
+        {
+          name: '风电项目'
+        },
+        {
+          name: '其他'
+        }
+      ],
+      itemArray: [
+        {
+          name: '深孔'
+        },
+        {
+          name: '浅孔'
+        },
+        {
+          name: '路由'
+        }
+      ],
+      receiveArray: [
+        {
+          name: '已接收'
+        },
+        {
+          name: '待接收'
+        }
+      ],
       iconMsg: [
         {
           type: 'md-trash',

pages/soil-alone-sample/EntrustRegisterHis.vue

@@ -101,6 +101,10 @@ export default {
         { title: '项目名称', key: 'projectName', width: 120 },
         { title: '项目负责人', key: 'projectLeader', width: 150, detail: true },
         { title: '钻孔名称', key: 'boreholeName', width: 120 },
+        { title: '深度', key: 'receiveDepth', width: 120 },
+        { title: '工程类型', key: 'projectType', width: 120 },
+        { title: '项目类型', key: 'itemType', width: 120 },
+        { title: '接收状态', key: 'receiveStatus', width: 120 },
         { title: '箱数', key: 'casesNum', width: 120 },
         { title: '登记日期', key: 'registTime', width: 120, date: true }
       ]