Ver código fonte

【修改】bug

howie 3 anos atrás
pai
commit
01b5b05dd1

+ 6 - 1
src/views/basic_data/dealer/dealer_stock.vue

@@ -28,10 +28,12 @@
         </el-popconfirm>
       </div>
       <div class="fr">
+           <el-button type="primary" size="mini" @click="downLoadFns">导出</el-button>
         <el-button type="primary" size="mini" @click="downLoadFn">下载模板</el-button>
         <el-upload class="import-btn" action="" :http-request="handleImport" :file-list="importFileList" :show-file-list="false">
           <el-button type="primary" size="mini">导入</el-button>
         </el-upload>
+
       </div>
     </div>
 
@@ -347,7 +349,10 @@ export default {
     downLoadFn() {
       downloadFiles("/customer/pt/download");
     },
-
+ //下载模板
+    downLoadFns() {
+      downloadFiles("/customer/pt/export");
+    },
     // //改变产品大类
     // changeSelectFn(value) {
     //   // const res = this.categoryList.filter((v) => v.productCategoryId == value);

+ 7 - 0
src/views/basic_data/stock/product_list.vue

@@ -94,6 +94,13 @@
             min-width="100"
             show-overflow-tooltip
           />
+            <el-table-column
+            align="left"
+            label="存货类别"
+            prop="categoryName"
+            min-width="100"
+            show-overflow-tooltip
+          />
           <el-table-column
             align="left"
             label="物料代码"

+ 1 - 1
src/views/supply/apply/apply_list.vue

@@ -194,7 +194,7 @@
             <el-table-column align="left" label="政策说明" prop="policyTitle" min-width="350" show-overflow-tooltip>
 
             </el-table-column>
-               <el-table-column align="left" label="文件编号" prop="fileNo" min-width="350" show-overflow-tooltip>
+               <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="350" show-overflow-tooltip>
 
             </el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>

+ 1 - 1
src/views/supply/apply/components/apply_detail.vue

@@ -35,7 +35,7 @@
           </el-col>
             <el-col :span="12" class="item">
             <div class="label">文件编号</div>
-            <div class="value">{{detailData.fileNo}}</div>
+            <div class="value">{{detailData.itemFileNo}}</div>
           </el-col>
           <el-col :span="16" class="item">
             <div class="label">备注</div>

+ 2 - 2
src/views/supply/apply/components/engin_detail.vue

@@ -39,7 +39,7 @@
           </el-col>
 <el-col :span="8" class="item">
             <div class="label">文件编码</div>
-            <div class="value">{{detailData.fileNo}}</div>
+            <div class="value">{{detailData.itemFileNo}}</div>
           </el-col>
 
 
@@ -142,7 +142,7 @@
           <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-             <!-- <el-table-column align="left" label="文件编号" prop="fileNo" min-width="200" show-overflow-tooltip>
+             <!-- <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="200" show-overflow-tooltip>
             </el-table-column> -->
          <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">

+ 1 - 1
src/views/supply/apply/engin_list.vue

@@ -210,7 +210,7 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="文件编号" prop="fileNo" min-width="200" show-overflow-tooltip>
+          <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="200" show-overflow-tooltip>
             </el-table-column>
           <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">