Merge remote-tracking branch 'lanju/master'

src/pages/quality/BpCheck/index.vue

@@ -5,11 +5,11 @@
 
     <u-form id="form" class="page-form" ref="form" label-width="180rpx">
       <u-form-item required  label="日期">
-        <u-input @click="showCalendar = true" placeholder="请选择日期" v-model="form.checkDate" :clearable="true"  readonly :disabled="true" />
+        <u-input @click="showCalendar = true" placeholder="请选择日期" v-model="form.checkDate" :clearable="true"  readonly />
         <u-icon name="close-circle-fill" @click="clearDate" color="rgb(96, 98, 102)" size="28"></u-icon>
       </u-form-item>
       <u-form-item required  label="物料清单">
-        <u-input @click="clickShowList" v-model="form.materialName" placeholder="请选择物料清单" :show-action="false"  readonly :disabled="true"></u-input>
+        <u-input @click="clickShowList" v-model="form.materialName" placeholder="请选择物料清单" :show-action="false"  readonly ></u-input>
         <u-icon name="close-circle-fill" @click="clearMaterial" color="rgb(96, 98, 102)" size="28"></u-icon>
       </u-form-item>
       <u-form-item required  label="检查数量">

src/pages/quality/ProductSample/index.vue

@@ -16,7 +16,7 @@
         <view v-if="list.length > 0">
           <view class="list-item" v-for="(item, index) in list" :key="index" >
             <lj-list-row label="物料名称:" :value="item.materialName" />
-            <lj-list-row label="来料批次号:" :value="item.incomeBatchNo" />
+            <lj-list-row label="批次号:" :value="item.incomeBatchNo" />
             <lj-list-row label="留样时间:" :value="formatDate(item.sampleTime, '未留样')" />
 
             <view v-if="!item.sampleTime" class="righttitle">