Browse Source

bug 修复

lilei 3 years ago
parent
commit
69bffa3251

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -6,8 +6,8 @@
         <template slot="subTitle">
           <a id="purchaseOrderDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span class="billno">单号:{{ detail&&detail.purchaseBillNo }}</span>
-          <a-tag color="blue">{{ detail&&detail.billStatusDictValue }}</a-tag>
-          <a-tag color="orange">{{ detail&&detail.financialStatusDictValue }}</a-tag>
+          <a-tag color="blue" v-if="detail&&detail.billStatusDictValue">{{ detail&&detail.billStatusDictValue }}</a-tag>
+          <a-tag color="orange" v-if="detail&&detail.financialStatusDictValue">{{ detail&&detail.financialStatusDictValue }}</a-tag>
           <span class="billno" v-if="detail&&detail.purchaseBillNoSource" style="font-size: 14px;margin: 0;">(原:{{ detail&&detail.purchaseBillNoSource }})</span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->

+ 32 - 32
src/views/salesManagement/salesQuery/queryPart.vue

@@ -10,45 +10,37 @@
         :model="queryParam"
         @keyup.enter.native="$refs.table.refresh(true)" >
         <a-row :gutter="5">
-          <a-col :md="6" :sm="24" v-if="$hasPermissions('B_salerVinFindProduct')">
-            <a-form-model-item label="车架号(VIN)" prop="vinCode">
-              <a-input id="productInfoList-vinCode" v-model.trim="queryParam.vinCode" allowClear placeholder="请输入车架号(VIN)">
-                <a-icon @click="uploadFun" :type="vinLoading?'loading':'camera'" slot="addonAfter" :style="{ fontSize: '18px', verticalAlign: 'bottom' }" />
-              </a-input>
-              <input type="file" id="filed" accept="image/jpeg,image/png" hidden="" @change="filePreview">
-            </a-form-model-item>
-          </a-col>
-          <a-col :md="5" :sm="24">
+          <a-col :md="4" :sm="24">
             <a-form-model-item label="产品编码">
               <a-input id="productInfoList-code" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
             </a-form-model-item>
           </a-col>
-          <a-col :md="5" :sm="24">
+          <a-col :md="4" :sm="24">
             <a-form-model-item label="产品名称">
               <a-input id="productInfoList-name" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
             </a-form-model-item>
           </a-col>
+          <a-col :md="4" :sm="24">
+            <a-form-model-item label="原厂编码">
+              <a-input id="productInfoList-origCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :md="4" :sm="24">
+            <a-form-model-item label="产品分类">
+              <a-cascader
+                @change="changeProductType"
+                change-on-select
+                v-model="productType"
+                expand-trigger="hover"
+                :options="productTypeList"
+                :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
+                id="productInfoList-productType"
+                placeholder="请选择产品分类"
+                allowClear />
+            </a-form-model-item>
+          </a-col>
           <template v-if="advanced">
-            <a-col :md="8" :sm="24">
-              <a-form-model-item label="原厂编码">
-                <a-input id="productInfoList-origCode" v-model.trim="queryParam.productOrigCode" allowClear placeholder="请输入原厂编码"/>
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-model-item label="产品分类">
-                <a-cascader
-                  @change="changeProductType"
-                  change-on-select
-                  v-model="productType"
-                  expand-trigger="hover"
-                  :options="productTypeList"
-                  :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
-                  id="productInfoList-productType"
-                  placeholder="请选择产品分类"
-                  allowClear />
-              </a-form-model-item>
-            </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-model-item label="产品品牌">
                 <a-select
                   placeholder="请选择产品品牌"
@@ -62,7 +54,7 @@
                 </a-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="5" :sm="24">
+            <a-col :md="4" :sm="24">
               <a-form-model-item label="仓库">
                 <a-select
                   placeholder="请选择仓库"
@@ -76,11 +68,19 @@
                 </a-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="8" :sm="24" v-if="$hasPermissions('B_salerVinFindProduct')">
+              <a-form-model-item label="车架号(VIN)" prop="vinCode">
+                <a-input id="productInfoList-vinCode" v-model.trim="queryParam.vinCode" allowClear placeholder="请输入车架号(VIN)">
+                  <a-icon @click="uploadFun" :type="vinLoading?'loading':'camera'" slot="addonAfter" :style="{ fontSize: '18px', verticalAlign: 'bottom' }" />
+                </a-input>
+                <input type="file" id="filed" accept="image/jpeg,image/png" hidden="" @change="filePreview">
+              </a-form-model-item>
+            </a-col>
           </template>
           <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" id="productInfoList-reset">重置</a-button>
-            <a @click="advanced=!advanced" style="margin:0 5px">
+            <a @click="advanced=!advanced" style="margin:0 30px 0 10px">
               {{ advanced ? '收起' : '展开' }}
               <a-icon :type="advanced ? 'up' : 'down'"/>
             </a>