Jelajahi Sumber

【修改】bug

莫绍宝 3 tahun lalu
induk
melakukan
2b9db2be76

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

@@ -84,7 +84,7 @@
       <el-table :data="detailData.orders" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
         <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="销售订单号" prop="orderId" min-width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="200" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>

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

@@ -76,7 +76,7 @@
       <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
         <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="销售订单号" prop="orderId" min-width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="销售订单号" prop="mainOrderId" min-width="200" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>

+ 21 - 5
src/views/supply/pickup/components/pickup_print.vue

@@ -9,7 +9,7 @@
           </el-col>
           <el-col :span="6" class="item">
             <div class="label">出库日期:</div>
-            <div class="value">{{detailData.createBy}}</div>
+            <div class="value">{{getDate()}}</div>
           </el-col>
           <el-col :span="6" class="item">
             <div class="label">仓库:</div>
@@ -17,7 +17,7 @@
           </el-col>
           <el-col :span="6" class="item">
             <div class="label">信息密钥:</div>
-            <div class="value">{{detailData.customerNumber}}</div>
+            <div class="value">{{detailData.informationKey}}</div>
           </el-col>
           <el-col :span="24" class="item">
             <div class="label">经销商:</div>
@@ -45,9 +45,9 @@
             <el-row :gutter="20">
               <el-col :span="3">{{ item.invoiceId || '' }}</el-col>
               <el-col :span="2">{{ item.saleTypeName || '' }}</el-col>
-              <el-col :span="3">{{ item.aaa || '' }}</el-col>
+              <el-col :span="3">{{ item.fileNo || '' }}</el-col>
               <el-col :span="6">{{ item.specification || '' }}</el-col>
-              <el-col :span="2">{{ item.qty || 0 }}</el-col>
+              <el-col :span="2">{{ item.refundableQty || 0 }}</el-col>
               <el-col :span="2">{{ item.unit || '' }}</el-col>
               <el-col :span="2">{{ item.price || 0 }}</el-col>
               <el-col :span="2">{{ item.payAmount || 0 }}</el-col>
@@ -58,7 +58,7 @@
               <el-col :span="2">发货日期</el-col>
               <el-col :span="4">{{ item.theTime || '' }}</el-col>
               <el-col :span="2">工程编号</el-col>
-              <el-col :span="3">{{ item.aaa || '' }}</el-col>
+              <el-col :span="3">{{ item.refEnginRecordNo || '' }}</el-col>
               <el-col :span="2">备注</el-col>
               <el-col :span="8">{{ item.remark || '' }}</el-col>
             </el-row>
@@ -142,6 +142,22 @@ export default {
       this.$emit('backListFormDetail');
     },
 
+    getDate() {
+      var date = new Date();
+      var seperator1 = "-";
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      var strDate = date.getDate();
+      if (month >= 1 && month <= 9) {
+          month = "0" + month;
+      }
+      if (strDate >= 0 && strDate <= 9) {
+          strDate = "0" + strDate;
+      }
+      var currentdate = year + seperator1 + month + seperator1 + strDate;
+      return currentdate;
+    },
+
     // 获取详情
     getDetail() {
       getDetail({id: this.listItem.id}).then(res => {

+ 1 - 1
src/views/supply/retail/components/retail_detail.vue

@@ -227,7 +227,7 @@
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="center" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="调出仓库" prop="warehouse1" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="调出仓位" prop="position1" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="调入仓库" prop="warehouse2" min-width="100" show-overflow-tooltip></el-table-column>

+ 1 - 1
src/views/supply/retail/components/retail_examine.vue

@@ -56,7 +56,7 @@
         <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="返利类型" prop="customerWalletName2" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>

+ 1 - 1
src/views/supply/retail/components/retail_return.vue

@@ -56,7 +56,7 @@
         <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="center" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="订单金额" prop="totalAmount" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="返利钱包" prop="customerWalletName2" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="返利金额" prop="rebateAmount" min-width="100" show-overflow-tooltip></el-table-column>