UI界面修改

src/components/DialogImport.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="visible"
-    title="导入数据"
+    title="导入标签申领数据"
     append-to-body
     width="500px"
   >

src/components/DialogMaterialDetail.vue

@@ -1,7 +1,7 @@
 <template>
     <el-dialog
       :visible.sync="visible"
-      :title="`${operatorType.name}物料详情`"
+      title="物料详情"
       append-to-body
       width="750px"
     >
@@ -16,13 +16,13 @@
                   :gutter="$$Constant.LAYOUT_GAP"
                 >
                   <el-col :span="12">
-                    <el-form-item label="物料商品编码">
+                    <el-form-item label="商品编码">
                       <el-input v-model="data.goodsCode" readonly/>
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="物料名称">
-                      <el-input v-model="data.name" readonly />
+                    <el-form-item label="商品名称">
+                      <el-input v-model="data.goodsName" readonly />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -64,8 +64,8 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="12">
-                    <el-form-item label="品牌">
-                      <el-input v-model="data.brand" readonly />
+                    <el-form-item label="标签类型">
+                      <el-input v-model="data.tagTypeName" readonly />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -73,7 +73,7 @@
                   :gutter="$$Constant.LAYOUT_GAP"
                 >
                   <el-col :span="12">
-                    <el-form-item label="生产商名称">
+                    <el-form-item label="供应商">
                       <el-input v-model="data.manufacturer" readonly />
                     </el-form-item>
                   </el-col>
@@ -87,7 +87,7 @@
                   :gutter="$$Constant.LAYOUT_GAP"
                 >
                   <el-col :span="12">
-                    <el-form-item label="最小包装单元">
+                    <el-form-item label="计件单位">
                       <el-input v-model="data.minimumPackingUnit" readonly />
                     </el-form-item>
                   </el-col>
@@ -97,15 +97,6 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-                <el-row
-                  :gutter="$$Constant.LAYOUT_GAP"
-                >
-                  <el-col :span="12">
-                    <el-form-item label="标签类型">
-                      <el-input v-model="data.tagTypeName" readonly />
-                    </el-form-item>
-                  </el-col>
-                </el-row>
             </div>
       </el-form>
 

src/components/DialogTagApplyDetail.vue

@@ -72,7 +72,7 @@
               align="center"
             ></el-table-column>
             <el-table-column
-              label="最小包装单位"
+              label="计件单位"
               min-width="80"
               prop="minimumPackingUnit"
               header-align="center"
@@ -94,21 +94,21 @@
                 prop="unitPrice"
                 align="right"
                 min-width="70"
-                header-align="center"
+                header-align="right"
               ></el-table-column>
             <el-table-column
                 label="费用（元）"
                 prop="amount"
                 align="right"
                 min-width="70"
-                header-align="center"
+                header-align="right"
               ></el-table-column>
               <el-table-column
                 label="标签类型"
                 prop="tagTypeName"
                 align="left"
                 min-width="120"
-                header-align="center"
+                header-align="left"
               ></el-table-column>
               <el-table-column
                 label="操作栏"

src/components/DialogTagCodeSerialDetail.vue

@@ -26,7 +26,7 @@
           <el-table-column
             label="商品名称"
             prop="goodsName"
-            header-align="center"
+            header-align="left"
             min-width="200"
             align="left"
           ></el-table-column>
@@ -59,7 +59,7 @@
             align="center"
           ></el-table-column>
           <el-table-column
-            label="最小包装单位"
+            label="计件单位"
             prop="minimumPackingUnit"
             header-align="center"
             min-width="100"
@@ -82,14 +82,14 @@
           <el-table-column
             label="单价（元）"
             prop="unitPrice"
-            header-align="center"
+            header-align="right"
             min-width="70"
             align="right"
           ></el-table-column>
           <el-table-column
             label="费用（元）"
             prop="amount"
-            header-align="center"
+            header-align="right"
             min-width="70"
             align="right"
           ></el-table-column>

src/components/DialogTagDistributeDetail.vue

@@ -54,7 +54,7 @@
               align="center"
             ></el-table-column>
             <el-table-column
-              label="最小包装单位"
+              label="计件单位"
               min-width="80"
               prop="minimumPackingUnit"
               header-align="center"
@@ -72,21 +72,21 @@
                 prop="unitPrice"
                 align="right"
                 min-width="70"
-                header-align="center"
+                header-align="right"
               ></el-table-column>
             <el-table-column
                 label="费用（元）"
                 prop="amount"
                 align="right"
                 min-width="70"
-                header-align="center"
+                header-align="right"
               ></el-table-column>
               <el-table-column
                 label="标签类型"
                 prop="tagTypeName"
                 align="left"
                 min-width="120"
-                header-align="center"
+                header-align="left"
               ></el-table-column>
           </el-table>
         </div>

src/components/DialogTagPurchase.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :visible.sync="visible"
-    :title="`${operatorType.name}采购`"
+    :title="`${operatorType.name}标签采购`"
     append-to-body
     width="750px"
   >
@@ -14,7 +14,7 @@
     <div class="overflow-auto" style="max-height:300px;padding:0 10px;">
             <el-row :gutter="$$Constant.LAYOUT_GAP">
               <el-col :span="12">
-                <el-form-item label="标签供应商" prop="provider">
+                <el-form-item label="供应商" prop="provider">
                   <my-select
                     v-model="data.providerId"
                     :options="optionGroup.TagProvider ? optionGroup.TagProvider.list : []"
@@ -22,7 +22,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="收货日期">
+                <el-form-item label="到货日期">
                   <el-date-picker
                     style="width: 250px;"
                     v-model="data.dataTime"

src/components/DialogTagPurchaseDetail.vue

@@ -75,14 +75,14 @@
                 prop="unitPrice"
                 align="right"
                 min-width="70"
-                header-align="center"
+                header-align="right"
               ></el-table-column>
             <el-table-column
                 label="费用（元）"
                 prop="amount"
                 align="right"
                 min-width="70"
-                header-align="center"
+                header-align="right"
               ></el-table-column>
               <el-table-column
                 label="操作栏"

src/views/MaterialDetail.vue

@@ -5,13 +5,13 @@
           <el-row :gutter="$$Constant.LAYOUT_GAP">
             <el-col :span="8">
               <el-form-item label="物料名称">
-               <el-input v-model="query.name" placeholder="输入物料名称"></el-input>
+               <el-input v-model="query.name" placeholder="输入物料名称" @keyup.enter.native="onSearchBtnClick"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="8">
               <el-form-item label="物料编码">
-               <el-input v-model="query.materielCode" placeholder="输入物料编码"></el-input>
+               <el-input v-model="query.materielCode" placeholder="输入物料编码" @keyup.enter.native="onSearchBtnClick"></el-input>
               </el-form-item>
             </el-col>
 
@@ -93,7 +93,7 @@
                 fixed
               ></el-table-column>
               <el-table-column
-                label="物料商品编码"
+                label="商品编码"
                 prop="goodsCode"
                 align="center"
                 min-width="80"
@@ -101,10 +101,10 @@
                 fixed
               ></el-table-column>
               <el-table-column
-                label="物料名称"
+                label="商品名称"
                 prop="name"
                 min-width="150"
-                header-align="center"
+                header-align="left"
                 align="left"
                 fixed
               ></el-table-column>
@@ -119,42 +119,35 @@
                 label="大类"
                 prop="bigCategoryName"
                 min-width="80"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column
                 label="中类"
                 prop="middleCategoryName"
                 min-width="80"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column
                 label="小类"
                 prop="smallCategoryName"
                 min-width="80"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column
                 label="物料描述"
                 prop="materielDescribe"
                 min-width="150"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column
-                label="品牌"
-                prop="brand"
-                align="left"
-                min-width="100"
-                header-align="center"
-              ></el-table-column>
-              <el-table-column
-                label="生产商名称"
+                label="供应商"
                 prop="manufacturer"
                 min-width="100"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column

src/views/MaterialTag.vue

@@ -65,28 +65,28 @@
                 label="物料名称"
                 prop="name"
                 min-width="150"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column
                 label="商品名称"
                 prop="providerName"
                 min-width="150"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column
                 label="物料小类"
                 prop="smallCategoryName"
                 min-width="120"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column
                 label="标签类型"
                 prop="tagTypeName"
                 min-width="120"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
             </el-table>

src/views/MessageCenter.vue

@@ -38,7 +38,7 @@
                 label="消息内容"
                 prop="content"
                 min-width="200"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
             </el-table>

src/views/ProviderDetail.vue

@@ -6,7 +6,9 @@
             <el-col :span="8">
               <el-form-item label="供应商">
                 <el-input v-model="query.name"
-                    placeholder="输入供应商全名或缩写"></el-input>
+                    placeholder="输入供应商全名或缩写"
+                    @keyup.enter.native="onSearchBtnClick">
+                  </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="16" class="text-right">
@@ -61,14 +63,14 @@
                 label="供应商名称"
                 prop="name"
                 min-width="150"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column
                 label="供应商名称缩写"
                 prop="abbr"
                 min-width="100"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column
@@ -89,7 +91,7 @@
                 label="邮箱"
                 prop="mail"
                 min-width="100"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column
@@ -97,7 +99,7 @@
                 prop="address"
                 align="left"
                 min-width="200"
-                header-align="center"
+                header-align="left"
               ></el-table-column>
             </el-table>
           </div>

src/views/TagApply.vue

@@ -154,14 +154,14 @@
             label="供应商名称"
             prop="providerName"
             min-width="200"
-            header-align="center"
+            header-align="left"
             align="left"
           ></el-table-column>
           <el-table-column
             label="费用（元）"
             prop="amount"
             min-width="84"
-            header-align="center"
+            header-align="right"
             align="right"
           ></el-table-column>
           <el-table-column

src/views/TagCode.vue

@@ -92,16 +92,9 @@
               label="供应商名称"
               prop="providerName"
               min-width="200"
-              header-align="center"
+              header-align="left"
               align="left"
             ></el-table-column>
-            <el-table-column
-              label="费用（元）"
-              prop="amount"
-              min-width="84"
-              header-align="center"
-              align="right"
-            ></el-table-column>
             <el-table-column
               label="状态"
               prop="tagApplyStateName"
@@ -109,13 +102,6 @@
               header-align="center"
               align="center"
             ></el-table-column>
-            <el-table-column
-              label="操作员"
-              prop="operatorName"
-              min-width="85"
-              header-align="center"
-              align="center"
-            ></el-table-column>
             <el-table-column
               label="操作栏"
               min-width="200"

src/views/TagDistribute.vue

@@ -78,7 +78,7 @@
                 label="供应商名称"
                 prop="providerName"
                 min-width="160"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column
@@ -86,7 +86,7 @@
                 prop="amount"
                 align="right"
                 min-width="70"
-                header-align="center"
+                header-align="right"
               ></el-table-column>
               <el-table-column
                 label="状态"

src/views/TagProviderDetail.vue

@@ -6,7 +6,7 @@
             <el-col :span="8">
               <el-form-item label="供应商">
                 <el-input v-model="query.name"
-                    placeholder="输入供应商全名或缩写"></el-input>
+                    placeholder="输入供应商全名或缩写" @keyup.enter.native="onSearchBtnClick"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="16" class="text-right">
@@ -61,14 +61,14 @@
                 label="供应商名称"
                 prop="name"
                 min-width="150"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column
                 label="供应商名称缩写"
                 prop="abbr"
                 min-width="100"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column
@@ -89,7 +89,7 @@
                 label="邮箱"
                 prop="mail"
                 min-width="100"
-                header-align="center"
+                header-align="left"
                 align="left"
               ></el-table-column>
               <el-table-column
@@ -97,7 +97,7 @@
                 prop="address"
                 align="left"
                 min-width="200"
-                header-align="center"
+                header-align="left"
               ></el-table-column>
             </el-table>
           </div>

src/views/TagPurchase.vue

@@ -60,7 +60,7 @@
             size="small"
             class="custom-plain-button"
             @click="onExportOrderBtnClick"
-          >导出采购</el-button>
+          >订单导出</el-button>
 
           <el-button
             :disabled="selectedList.length === 0 || query.tagPurchaseStateId!=='0'"
@@ -70,7 +70,7 @@
             size="small"
             class="custom-plain-button"
             @click="onInStorageBtnClick"
-          >已入库</el-button>
+          >订单入库</el-button>
         </div>
 
         <div class="flex-1 fit-size">
@@ -118,7 +118,7 @@
               label="总价（元）"
               prop="amount"
               min-width="84"
-              header-align="center"
+              header-align="right"
               align="right"
             ></el-table-column>
             <el-table-column