chenrui vor 1 Jahr
Ursprung
Commit
4c6dc839fb

+ 2 - 1
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -8,11 +8,12 @@
             <a-icon type="left" />
             返回列表
           </a>
+          <a class="head-order-number">单号:{{ basicInfoData&&basicInfoData.storeCallOutNo || '--' }}</a>
           <a-button
             v-if="isEdit && $hasPermissions('B_storeCallOutEdit')"
             type="primary"
             size="small"
-            style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
+            style="background-color: #1890ff;border: #1890ff;"
             id="storeTransferOutDetail-edit-btn"
             @click.stop="handleEdit"
           >

+ 3 - 2
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="storeTransferOutEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a class="head-order-number">单号:{{ basicInfoData&&basicInfoData.storeCallOutNo || '--' }}</a>
           <span style="margin: 0 15px;color: #666;" v-if="basicInfoData">调往对象名称:{{ (basicInfoData.putPersonType=='EMPLOYEE'?basicInfoData.putPersonName:(basicInfoData.customerNameCurrent==basicInfoData.putPersonName?basicInfoData.customerNameCurrent:basicInfoData.customerNameCurrent+'('+basicInfoData.putPersonName+')')) || '--' }}</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
@@ -398,10 +399,10 @@ export default {
       this.$refs.chooseTable.refresh(true)
     },
     // 确认导入明细
-    importOk(data){
+    importOk (data) {
       this.spinning = true
       storeCallOutDetailBatchSave(data).then(res => {
-        if(res.status == 200){
+        if (res.status == 200) {
           this.chooseResetSearchForm()
         }
         this.spinning = false

+ 2 - 1
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -5,11 +5,12 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle" v-if="!outBizSn">
           <a id="warehouseAllocationDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a class="head-order-number">单号:{{ warehouse&&warehouse.allocationWarehouseNo || '--' }}</a>
           <a-button
             v-if="warehouse&&warehouse.stateDictValue!='已完结'&&$hasPermissions('B_warehouseAllocationEdit')"
             type="primary"
             size="small"
-            style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
+            style="background-color: #1890ff;border: #1890ff;"
             id="warehouseAllocationEdit-btn"
             @click.stop="handleEdit">
             编辑

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

@@ -5,6 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="warehouseAllocationEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a class="head-order-number">单号:{{ basicInfoData&&basicInfoData.allocationWarehouseNo || '--' }}</a>
           <span style="margin: 0 15px;color: #666;">调出仓库:{{ (basicInfoData&&basicInfoData.outWarehouseName) || '--' }}</span>
           <span style="margin: 0 15px;color: #666;">调入仓库:{{ (basicInfoData&&basicInfoData.putWarehouseName) || '--' }}</span>
         </template>

+ 1 - 1
src/views/inventoryManagement/inventoryChecking/overall.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="inventoryCheckOverallList-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <span class="billno">单号:{{ basicInfoData&&basicInfoData.checkWarehouseNo }}</span>
+          <span class="head-order-number">单号:{{ basicInfoData&&basicInfoData.checkWarehouseNo }}</span>
           <a-tag color="blue">{{ basicInfoData&&basicInfoData.stateDictValue }}</a-tag>
         </template>
       </a-page-header>

+ 10 - 10
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -12,7 +12,7 @@
         <div ref="tableSearch" class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
             <a-row :gutter="15">
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="变动类型">
                   <v-select
                     v-model="queryParam.flowType"
@@ -23,7 +23,7 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="单据类型">
                   <v-select
                     v-model="queryParam.bizType"
@@ -39,14 +39,14 @@
                   <a-input id="inventoryQueryWarehouseDetail-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入关联单据号"/>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
-                <a-form-item label="仓库">
-                  <a-select id="inventoryQueryWarehouseDetail-warehouseSn" placeholder="请选择仓库" allowClear v-model="queryParam.warehouseSn" >
-                    <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
-                  </a-select>
-                </a-form-item>
-              </a-col>
               <template v-if="advanced">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="仓库">
+                    <a-select id="inventoryQueryWarehouseDetail-warehouseSn" placeholder="请选择仓库" allowClear v-model="queryParam.warehouseSn" >
+                      <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="单据审核时间">
                     <rangeDate ref="rangeDate" @change="dateChange" />
@@ -57,7 +57,7 @@
                     <a-input id="inventoryQueryWarehouseDetail-unitName" v-model.trim="queryParam.unitNameCurrent" allowClear placeholder="请输入单位名称"/>
                   </a-form-item>
                 </a-col>
-                <a-col :md="4" :sm="24">
+                <a-col :md="6" :sm="24">
                   <a-form-item label="出入库状态">
                     <v-select
                       v-model="queryParam.state"

+ 1 - 1
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -5,7 +5,7 @@
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
           <a id="storingLocationList-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-          <strong style="color: rgba(0, 0, 0);margin-left: 50px;">所属仓库:{{ $route.query.name || '--' }}</strong>
+          <span style="color: #666;margin-left: 15px;">所属仓库:{{ $route.query.name || '--' }}</span>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" class="storingLocationList-cont">