qukaidi 4 年之前
父节点
当前提交
37a5ad8828
共有 2 个文件被更改,包括 10 次插入10 次删除
  1. 7 7
      src/views/Warehousing/inStock/AddOrUpdate.vue
  2. 3 3
      src/views/Warehousing/outStock/AddOrUpdate.vue

+ 7 - 7
src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1097,10 +1097,10 @@
                 @click="addRelevant('copy')"
                 >复制录入</el-button
               >
-              <el-button :disabled="browseStatus" type="primary" size="small">
+              <el-button type="primary" size="small">
                 下载模板
               </el-button>
-              <el-button size="small" type="primary"
+              <el-button size="small" type="primary" @click="openUploadExcel"
                 >导入Execl</el-button
               >
             </el-col>
@@ -1701,7 +1701,7 @@
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ item.fTruckno }}</td>
-              <td>{{ item.fGoodsids }}</td>
+              <td>{{ item.fGoodsid|goodsFormat(goodsOptions)}}</td>
               <td>{{ item.fMblno }}</td>
               <td>
                 {{ item.fBusinessType | fStorageFormat }}/{{ item.fMarks }}
@@ -1783,7 +1783,7 @@
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>货物品名</td>
-              <td>{{ item.fGoodsids }}</td>
+              <td>{{ item.fGoodsid|goodsFormat(goodsOptions)}}</td>
               <td>件数</td>
               <td>{{ item.fQty }}件</td>
             </tr>
@@ -1994,7 +1994,7 @@
               <td>备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
-              <td>{{ item.fGoodsids }}</td>
+              <td>{{ item.fGoodsid|goodsFormat(goodsOptions)}}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fCntqty }}</td>
               <td>{{ item.fQty }}</td>
@@ -2084,7 +2084,7 @@
               <td>备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
-              <td>{{ item.fGoodsids }}</td>
+              <td>{{ item.fGoodsid|goodsFormat(goodsOptions)}}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fCntqty }}</td>
               <td>{{ item.fQty }}</td>
@@ -2281,7 +2281,7 @@
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ index + 1 }}</td>
               <td>{{ item.fChargedate }}</td>
-              <td>{{ item.fGoodsids }}</td>
+              <td>{{ item.fGoodsid|goodsFormat(goodsOptions)}}</td>
               <td>{{ item.fMblno }}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fQty }}</td>

+ 3 - 3
src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -2086,7 +2086,7 @@
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ item.fTruckno }}</td>
-              <td>{{ item.fGoodsids }}</td>
+              <td>{{ item.fGoodsid|goodsFormat(goodsOptions)}}</td>
               <td>{{ item.fMblno }}</td>
               <td>
                 {{ item.fBusinessType | fStorageFormat }}/{{ item.fMarks }}
@@ -2187,7 +2187,7 @@
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
               <td>{{ item.fMblno }}</td>
-              <td>{{ item.fGoodsids }}</td>
+              <td>{{ item.fGoodsid|goodsFormat(goodsOptions)}}</td>
               <td>{{ item.fCntrtype }}</td>
               <td>{{ item.fMarks }}</td>
               <td>{{ item.fQty }}</td>
@@ -2301,7 +2301,7 @@
               <td>备注</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
-              <td>{{ item.fGoodsids }}</td>
+              <td>{{ item.fGoodsid|goodsFormat(goodsOptions)}}</td>
               <td>{{ item.fMblno }}</td>
               <td>{{ item.fCntrno }}</td>
               <td>{{ item.fQty }}</td>