chenrui преди 4 години
родител
ревизия
baf4ae484d

+ 1 - 0
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -80,6 +80,7 @@
             @change="e => changeWarehouseCascade(e, record, index)"
             v-model="record.warehouseCascade"
             expand-trigger="hover"
+            :allowClear="false"
             :options="warehouseCascadeData"
             :fieldNames="{ label: 'name', value: 'id', children: 'warehouseLocationList' }"
             id="chainTransferInEdit-warehouseCascade"

+ 1 - 1
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -103,7 +103,7 @@
             </template>
             <!-- 调入仓位 -->
             <template slot="putWarehouseLocationSn" slot-scope="text, record">
-              <a-select id="warehouseAllocationEdit-putWarehouseLocationSn" placeholder="请选择" allowClear v-model="record.putWarehouseLocationSn" style="width: 100%;">
+              <a-select id="warehouseAllocationEdit-putWarehouseLocationSn" placeholder="请选择" v-model="record.putWarehouseLocationSn" style="width: 100%;">
                 <a-select-option v-for="item in warehousePutLocData" :key="item.warehouseLocationSn" :disabled="item.warehouseLocationSn==record.warehouseLocationSn" :value="item.warehouseLocationSn">{{ item.name }}</a-select-option>
               </a-select>
             </template>

+ 4 - 2
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -5,7 +5,7 @@
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
         <a id="bulkWarehousingOrderEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-        <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseSn) || '' }}</p>
+        <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseNo) || '' }}</p>
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <template slot="extra">
@@ -23,7 +23,7 @@
           </template>
           <a-descriptions :column="3">
             <a-descriptions-item label="供应商">{{ (basicInfoData&&basicInfoData.supplierName) || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="类型">{{ (basicInfoData&&basicInfoData.sparePartsTypeName) || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="散件入库类型">{{ (basicInfoData&&basicInfoData.sparePartsTypeName) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="备注">{{ (basicInfoData&&basicInfoData.remarks) || '--' }}</a-descriptions-item>
           </a-descriptions>
         </a-collapse-panel>
@@ -122,6 +122,7 @@
                   @change="e => changeWarehouseCascade(e, record, index, 'dealerProduct')"
                   v-model="record.warehouseCascade"
                   expand-trigger="hover"
+                  :allowClear="false"
                   :options="warehouseCascadeData"
                   :fieldNames="{ label: 'name', value: 'id', children: 'warehouseLocationList' }"
                   id="bulkWarehousingOrderEdit-warehouseCascade"
@@ -192,6 +193,7 @@
                   @change="e => changeWarehouseCascade(e, record, index, 'sparePartsPurDetail')"
                   v-model="record.warehouseCascade"
                   expand-trigger="hover"
+                  :allowClear="false"
                   :options="warehouseCascadeData"
                   :fieldNames="{ label: 'name', value: 'id', children: 'warehouseLocationList' }"
                   id="bulkWarehousingOrderEdit-choose-warehouseCascade"

+ 1 - 1
src/views/supplierManagement/supplierInfo/editModal.vue

@@ -97,7 +97,7 @@
       </a-form-model>
       <div class="btn-cont">
         <a-button type="primary" id="supplierInfoEdit-btn-submit" @click="handleSubmit">保存</a-button>
-        <a-button id="supplierInfoEdit-btn-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
+        <a-button id="supplierInfoEdit-btn-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
       </div>
     </div>
   </a-modal>