Parcourir la source

Merge branch 'develop_yh48-2' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh48-2

lilei il y a 8 mois
Parent
commit
846ca8302f

BIN
public/templ/自建产品导入模板.xlsx


+ 1 - 1
src/views/productManagement/productInfo/importGuideModal.vue

@@ -15,7 +15,7 @@
             <span>1</span>准备导入
           </div>
           <ul>
-            <li>1)必填项为"产品名称"、"产品编码"、"产品品牌"、"产品一级分类"。</li>
+            <li>1)必填项为"产品名称"、"产品编码"、"产品品牌"。</li>
             <li>2)错误项忽略不能导入,正确项可直接导入。</li>
             <li>3)支持上传文件格式:.xls、.xlsx。</li>
             <li><a :href="templUrl" id="importGuide-tpl-link"><a-icon type="download" />下载导入模板</a></li>

+ 1 - 1
src/views/productManagement/productInfo/list.vue

@@ -57,7 +57,7 @@
       <!-- 操作按钮 -->
       <div class="table-operator">
         <a-button v-if="$hasPermissions('B_product_dealerProduct_add')" id="productInfoList-add" type="primary" class="button-error" @click="handleEdit()">新增</a-button>
-        <a-button class="button-primary" v-if="$hasPermissions('B_product_dealerProduct_Export')" type="primary" @click="importProduct">导入</a-button>
+        <a-button class="button-primary"  type="primary" v-if="$hasPermissions('B_product_dealerProduct_Export')" @click="importProduct">导入</a-button>
         <a-dropdown v-if="$hasPermissions('B_product_dealerProduct_enable')">
           <a-menu slot="overlay" @click="handleMenuClick" id="productInfoList-menus">
             <a-menu-item key="1" id="productInfoList-menus-1"> 批量启用</a-menu-item>

+ 1 - 1
src/views/productManagement/productInfoJg/list.vue

@@ -32,7 +32,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="启用状态">
-                <v-select code="ENABLE_FLAG" id="productInfoList-enabledFlag" v-model="queryParam.enabledFlag" allowClear placeholder="请选择启用状态"></v-select>
+                <v-select code="PRODUCT_ENABLE_FALG" id="productInfoList-enabledFlag" v-model="queryParam.enabledFlag" allowClear placeholder="请选择启用状态"></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">

+ 1 - 1
src/views/reportData/frozenProductReport/list.vue

@@ -163,7 +163,7 @@ export default {
         { title: '批次号', dataIndex: 'stockBatchNo', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '关联单据号', dataIndex: 'outBizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'outBizTypeDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位名称', dataIndex: 'demanderName', width: '15%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '单位名称', dataIndex: 'demanderName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '冻结数量', dataIndex: 'outQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },