修改了委托单添加

components/user-info-single/assignPerson.vue

@@ -137,6 +137,20 @@ export default {
       this.$refs.userCheck._refresh()
       this.$refs.marshalling._open()
     },
+    _openOrg(modalTitle, treeName) {
+      this.modalTitle = modalTitle
+      this.changeBool = false
+      this.showUserModal = true
+      this.titleChange = '用户编组'
+      this._changeLimit()
+      if (treeName === undefined) {
+        this.treeName = 'userMan'
+      } else {
+        this.treeName = treeName
+      }
+      this.$refs.userCheck._refresh()
+      this.$refs.marshalling._open()
+    },
     // 当前登录用户所处的组织
     _getCurrentOrg: async function() {
       const result = await sysOrg.getOrg()
@@ -148,6 +162,7 @@ export default {
       }
     },
     _orgData(data) {
+      console.log(data)
       this.$refs.userCheck._open(data.id, this.treeName)
       this.currentRowData = {}
     },

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

@@ -35,7 +35,7 @@
             <Date-picker v-model="formObj.tabulateDate" @on-change="_tabulateChange" name="tabulateDate" type="date" split-panels style="width:100%;"
                          placeholder="请选择委托日期"></Date-picker>
           </Form-item>
-          <Form-item label="制表人" prop="tabulater" class="width-48">
+          <Form-item @click.native="_selectPerson" label="制表人" prop="tabulater" class="width-48">
             <Input v-model="formObj.tabulater" name="tabulater" placeholder="请输入名称"/>
           </Form-item>
 <!--          <Form-item label="检验类别" prop="testType" class="width-48">-->
@@ -91,12 +91,16 @@
                 ></el-input>
               </div>
               <div v-if="item.key==='samplePack'"  @click.stop="_handleRow(scope)">
-                <el-input v-model="scope.row.samplePack" blur placeholder="请输入试样包装类型"
-                ></el-input>
+                <AutoComplete v-model="scope.row.samplePack" :downData="packList"
+                              @on-result-change="_packChange" name="samplePack"  placeholder="请输入或选择包装类型"
+                ></AutoComplete>
               </div>
               <div v-if="item.key==='sampleDescribe'" @click.stop="_handleRow(scope)">
-                <el-input v-model="scope.row.sampleDescribe" blur placeholder="请输入土质描述"
-                ></el-input>
+<!--                <el-input v-model="scope.row.sampleDescribe" blur placeholder="请输入土质描述"-->
+<!--                ></el-input>-->
+                <AutoComplete v-model="scope.row.sampleDescribe" :downData="soilList"
+                              @on-result-change="_soilChange" name="sampleDescribe" placeholder="请输入或选择土质描述"
+                ></AutoComplete>
               </div>
               <div v-else-if="item.key==='itemNames'" @click.stop="_handleRow(scope)">
                 <el-input
@@ -119,6 +123,7 @@
     </Modal>
     <importModal ref="importModal" @on-result-change="_inputBack"   aptitude-item></importModal>
     <SampleItemSelect ref="sampleItemSelectModal" @on-result-change="_itemImportBack" is-change />
+    <assignPerson ref="userModal" @on-result-change="_userResult"></assignPerson>
   </div>
 </template>
 <script>
@@ -129,11 +134,14 @@ import { meterEntrust, meterSample, soilEntrust } from '../../../api'
 import importModal from '../../../components/import/DownloadTemplateImport'
 import AutoComplete from '../../../components/base/AutoCompletes'
 import SampleItemSelect from '../../meter-aptitude/standard-manage/SampleItemSelect'
+import assignPerson from '../../../components/user-info-single/assignPerson'
+import Global from '../../../api/config'
 export default {
   components: {
     AutoComplete,
     importModal,
-    SampleItemSelect
+    SampleItemSelect,
+    assignPerson
   },
   data() {
     const validatefee = (rule, value, callback) => {
@@ -249,6 +257,9 @@ export default {
         }
       ],
       typeoptions: [],
+      packList: [],
+      soilList: [],
+      currentIndex: -1,
       id: '',
       modalTitle: '',
       subcontractorId: '',
@@ -375,7 +386,37 @@ export default {
       }
       console.log(this.getPage.records)
     },
+    _selectPerson() {
+      this.$refs.userModal._openOrg('选择制表人', 'itemTree')
+    },
+    _userResult(data, msg) {
+      this.$forceUpdate()
+      console.log(data, msg)
+      this.formObj.tabulater = data.realname
+      console.log(this.formObj.tabulater)
+    },
+    _packChange(msg, data) {
+      switch (msg) {
+        case 'select':
+          this.getPage.records[this.currentIndex].samplePack = data
+          break
+        case 'query':
+          this.getPage.records[this.currentIndex].samplePack = data
+          break
+      }
+    },
+    _soilChange(msg, data) {
+      switch (msg) {
+        case 'select':
+          this.getPage.records[this.currentIndex].sampleDescribe = data
+          break
+        case 'query':
+          this.getPage.records[this.currentIndex].sampleDescribe = data
+          break
+      }
+    },
     _cusNameChange(msg, data) {
+      console.log(msg, data)
       console.log('选择')
       // this.financeObj = {} // 清空维护发票信息的数据
       if (this.$string(this.id).isEmpty()) {
@@ -558,7 +599,26 @@ export default {
       }
       this.getPage.records.unshift(data)
     },
-
+    _getPackList: async function() {
+      const result = await soilEntrust.testType('样品包装类型')
+      if (result) {
+        const pack = []
+        for (let i = 0; i < result.length; i++) {
+          pack.push(result[i].name)
+        }
+        this.packList = pack
+      }
+    },
+    _getSoil: async function() {
+      const result = await soilEntrust.testType('土质描述')
+      if (result) {
+        const soilRemark = []
+        for (let i = 0; i < result.length; i++) {
+          soilRemark.push(result[i].name)
+        }
+        this.soilList = soilRemark
+      }
+    },
     _importSample() {
       const data = {
         importUrl: '/meter/v1/sample/import_sample_pre',
@@ -715,9 +775,9 @@ export default {
             this._save(data)
           } else {
             // const saveData = this.formObj
-            console.log(data)
             data.id = this.id
             data.sampleList = this.getPage.records
+            console.log(data)
             this._edit(data)
           }
         } else {
@@ -752,9 +812,13 @@ export default {
     _open(formObj) {
       this._getList()
       this._getTestType()
+      this._getPackList()
+      this._getSoil()
+      this._getUser()
       this.showBtn = true
       this.showModal = true
       this.$refs.formObj.resetFields()
+      this._getUser()
       this._hideLoading()
       if (this.$string(formObj).isEmpty()) {
         this.getPage.records = []
@@ -772,9 +836,12 @@ export default {
       console.log(formObj)
       this._getList()
       this._getTestType()
+      this._getPackList()
+      this._getSoil()
       this.showBtn = false
       this.showModal = true
       this.$refs.formObj.resetFields()
+      this._getUser()
       this.getPage.records = []
       this._hideLoading()
       this.id = ''
@@ -793,11 +860,15 @@ export default {
       //   }
       // }
     },
+    _getUser() {
+      const user = Global.getUserInfo()
+      this.formObj.tabulater = user.realname
+    },
     _getTestType: async function() {
       const result = await soilEntrust.testType('检验类别')
       console.log(result)
       if (result) {
-        console.log(result)
+        console.log('检验类别', result)
         this.typeoptions = result
       }
     },