Finish Hotfix-zh-136

src/views/stock/stock_list.vue

@@ -71,7 +71,7 @@
       </div>
       <div class="table">
         <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
-          <el-table-column align="left" label="产品大类" prop="mainName" min-width="100" show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column align="left" label="产品大类" prop="mainName" min-width="100" show-overflow-tooltip></el-table-column> -->
           <el-table-column align="left" label="产品类别" prop="categoryName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">

src/views/supply/policy/policy_list.vue

@@ -474,13 +474,14 @@
               <template slot-scope="scope">
                 <el-popconfirm
                   v-if="scope.row.examineStatus === 'SAVE'"
-                  style="margin-right: 10px"
+                  style="margin-left: 10px"
                   title="确定提审？"
                   @onConfirm="handleSubmit(scope.row.id)"
                 >
                   <el-button slot="reference" type="text">提审</el-button>
                 </el-popconfirm>
                 <el-button
+                 style="margin-left: 10px"
                   v-if="
                     scope.row.examineStatus == 'WAIT' &&
                       $checkBtnRole('examine', $route.meta.roles)
@@ -492,6 +493,7 @@
                   <el-button slot="reference" type="text">删除</el-button>
                 </el-popconfirm>
                 <el-button
+                 style="margin-left: 10px"
                   v-if="
                     scope.row.examineStatus === 'SAVE' &&
                       $checkBtnRole('edit', $route.meta.roles)
@@ -499,7 +501,7 @@
                   type="text"
                   @click="toForm(scope.row)"
                 >编辑</el-button>
-                <el-popconfirm v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" style="margin-left: 10px;" title="确定弃审吗？" @onConfirm="handleAbandon(scope.row.id)">
+                <el-popconfirm  style="margin-left: 10px" v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'"  title="确定弃审吗？" @onConfirm="handleAbandon(scope.row.id)">
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
                 <el-popconfirm
@@ -520,6 +522,7 @@
                 >详情</el-button>
 
                 <el-button
+                 style="margin-left: 10px"
                   v-if="
                     scope.row.examineStatus === 'OK' &&
                       $checkBtnRole('examine', $route.meta.roles)

src/views/supply/price/price_list.vue

@@ -302,7 +302,7 @@
           />
           <el-table-column
             align="left"
-            label="是否促销价"
+            label="是否销价"
             prop="isPromote"
             min-width="160"
             show-overflow-tooltip
@@ -314,7 +314,7 @@
           </el-table-column>
           <el-table-column
             align="left"
-            label="是否促作废"
+            label="是否作废"
             prop="isRevoke"
             min-width="160"
             show-overflow-tooltip