diff --git a/src/views/modules/erf/expApplyList.vue b/src/views/modules/erf/expApplyList.vue
index 4a8be17..7a75e98 100644
--- a/src/views/modules/erf/expApplyList.vue
+++ b/src/views/modules/erf/expApplyList.vue
@@ -204,7 +204,14 @@
         header-align="center"
         show-overflow-tooltip>
       </el-table-column>
-
+      <el-table-column
+        prop="umName"
+        label="计量单位"
+        min-width="80"
+        align="left"
+        header-align="center"
+        show-overflow-tooltip>
+      </el-table-column>
 <!--      <el-table-column
         prop="productType"
         label="产品型号"
@@ -497,7 +504,10 @@
             style="width: 80%">
           </el-input>
         </el-form-item>
-
+        <el-form-item  required>
+          <span style="cursor: pointer" slot="label" @click="getBaseList(510)"><a herf="#">计量单位</a></span>
+          <el-input v-model="sampleConfirmData.umid"  style="width: 128px"></el-input>
+        </el-form-item>
         <el-form-item label="完成日期" required>
           <el-date-picker
             v-model="sampleConfirmData.finalFinishDate"
@@ -645,6 +655,8 @@
         </el-button>
       </div>
     </el-dialog>
+    <!-- chooseList模态框 -->
+    <Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist>
   </div>
 </template>
 
@@ -657,11 +669,12 @@ import ExpProjectDetail from './components/expProjectDetail.vue'
 import ExpTriConfirm from './components/expTriConfirm.vue'
 import ErfAttachmentManager from './components/erfAttachmentManager.vue'
 import ExpRawMaterialList from './components/expRawMaterialList.vue'
-
+import Chooselist from '@/views/modules/common/Chooselist_eam'
 export default {
   name: 'ExpApplyList',
 
   components: {
+    Chooselist,
     ExpApplyForm,
     ExpProjectDetail,
     ExpTriConfirm,
@@ -671,6 +684,7 @@ export default {
 
   data() {
     return {
+      tagNo:'',
       sendLoading: false, // 发送邮件的加载状态
       buList: [],
       // 查询条件
@@ -749,7 +763,8 @@ export default {
       sampleConfirmData: {
         applyNo: '',
         sampleQuantity: null,
-        finalFinishDate: ''
+        finalFinishDate: '',
+        umid:''
       },
 
       // 复制试验单弹窗
@@ -772,6 +787,35 @@ export default {
   },
 
   methods: {
+    // ======== chooseList相关方法 ========
+    /**
+     * 获取基础数据列表S
+     * @param val
+     * @param type
+     */
+    getBaseList (val, type) {
+      this.tagNo = val
+      this.$nextTick(() => {
+        let strVal = ''
+        let conSql = ''
+        if (val === 510) {
+          strVal = this.sampleConfirmData.umid?this.sampleConfirmData.umid:''
+          conSql = " and site = '" + (this.currentRow.buNo[1]?this.currentRow.buNo[1]:'1') + "'"
+
+        }
+        this.$refs.baseList.init(val, strVal, conSql)
+      })
+    },
+    /**
+     * 列表方法的回调
+     * @param val
+     */
+    getBaseData (val) {
+      if (this.tagNo === 510) {
+        this.sampleConfirmData.umid = val.UMID
+
+      }
+    },
     /**
      * 加载事业部列表
      */
@@ -1478,10 +1522,12 @@ export default {
     openSampleConfirm(row) {
       this.sampleConfirmData = {
         applyNo: row.applyNo,
+        umid: row.umid,
         sampleQuantity: null,
         finalFinishDate: ''
       }
       this.sampleConfirmVisible = true
+      console.log('打开样品确认对话框:'+this.sampleConfirmData)
     },
 
     /**
@@ -1524,7 +1570,8 @@ export default {
         applyNo: this.sampleConfirmData.applyNo,
         finalQuantity: finalQuantity,
         finalStatus: finalStatus,
-        actualFinishDate: this.sampleConfirmData.finalFinishDate
+        actualFinishDate: this.sampleConfirmData.finalFinishDate,
+        umid: this.sampleConfirmData.umid
       }).then(({data}) => {
         this.sampleConfirmLoading = false
         if (data && data.code === 0) {