样品可重复

itdmWeb/src/views/module-iTDM/weituo/modules/step/Step2.vue

@@ -105,7 +105,7 @@ export default {
       validatorRules: {
         sampleName: [
           { required: true, message: '请输入样品名称!' },
-          { validator: checkSampleName }
+          // { validator: checkSampleName }
         ],
         sampleModelSpecification: [
           { required: true, message: '请输入样品规格/型号!' }
@@ -220,7 +220,7 @@ export default {
     // 下一步
     nextStep() {
 
-      console.log(this.model.data)
+      console.log(11111,this.model.data)
       this.$refs.form.validate(valid => {
         if (valid) {
           sessionStorage.setItem('yangpin', JSON.stringify(this.model.data))

itdmWeb/src/views/module-iTDM/weituo/modules/step/Step3.vue

@@ -9,9 +9,15 @@
 
       <template slot="yangpinKeyId" slot-scope="text, record,index">
         <a-form-model-item :prop="'list.'+index+'.yangpinKeyId'" :rules="validatorRules.yangpinKeyId">
-          <a-select :disabled="formDisabled" v-model="record.yangpinKeyId" allowClear :dropdownMatchSelectWidth="false">
-            <a-select-option v-for="d in yangpins" :key="d.sampleName">
-              {{ d.sampleName }}
+          <a-select :disabled="formDisabled" v-model="record.yangpinKeyId" allowClear :dropdownMatchSelectWidth="false" option-label-prop="label">
+            <!-- 针对样品名称有相同的情况，做以下更改 -->
+            <!-- <a-select-option v-for="d in yangpins" :key="d.sampleName"> -->
+            <a-select-option v-for="d in yangpins" :key="d.key" :label="d.sampleName">
+              <!-- <el-row>
+                <el-col :span="12">{{ d.sampleName }}</el-col>
+                <el-col :span="12">{{ d.sampleModelSpecification }}</el-col>
+              </el-row> -->
+              {{ d.sampleName +'——'+ d.sampleModelSpecification}}
             </a-select-option>
           </a-select>
         </a-form-model-item>
@@ -196,7 +202,7 @@ export default {
       this.newMember()
     }
 
-    console.log(sessionStorage.getItem('yangpin'))
+    console.log(2323,sessionStorage.getItem('yangpin'))
     const yangpins = JSON.parse(sessionStorage.getItem('yangpin'))
 
     if (yangpins != null) {

itdmWeb/src/views/module-iTDM/weituoshenhe/ItdmWeituoshenheInfoList.vue

@@ -30,8 +30,8 @@
     <!-- 查询区域-END -->
 
     <!-- 操作按钮区域 -->
-    <!-- <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+    <div class="table-operator">
+      <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('委托信息')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>