Moss 1 рік тому
батько
коміт
5f0cf692ad

+ 18 - 14
src/views/mallManagement/order/offline_order_list/index.vue

@@ -160,19 +160,19 @@
                 <el-input size="small" v-model="scope.row.num"></el-input>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="内机数量" prop="insideQty" min-width="120">
+            <el-table-column align="center" label="内机数量" prop="insideNum" min-width="120">
               <template slot-scope="scope">
-                {{scope.row.insideQty}}
+                {{scope.row.insideNum}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="外机数量" prop="outQty" min-width="120">
+            <el-table-column align="center" label="外机数量" prop="outNum" min-width="120">
               <template slot-scope="scope">
-                {{scope.row.outQty}}
+                {{scope.row.outNum}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="配件数量" prop="partsQty" min-width="120">
+            <el-table-column align="center" label="配件数量" prop="partsNum" min-width="120">
               <template slot-scope="scope">
-                {{scope.row.partsQty}}
+                {{scope.row.partsNum}}
               </template>
             </el-table-column>
             <el-table-column align="center" label="单价" prop="price" min-width="120">
@@ -182,7 +182,7 @@
             </el-table-column>
             <el-table-column align="center" label="金额" prop="amount" min-width="120">
               <template slot-scope="scope">
-                {{scope.row.num * scope.row.price}}
+                {{scope.row.num * scope.row.price * 100 / 100}}
               </template>
             </el-table-column>
             <el-table-column align="center" label="库存数量" prop="stockQty" min-width="120">
@@ -318,7 +318,7 @@
           <el-table-column align="center" label="单价" prop="price" min-width="120"></el-table-column>
           <el-table-column align="center" label="金额" min-width="120">
             <template slot-scope="scope">
-              {{scope.row.num * scope.row.price}}
+              {{scope.row.num * scope.row.price * 100 / 100}}
             </template>
           </el-table-column>
           <el-table-column align="center" label="库存数量" prop="goodsMaterialStock" min-width="120"></el-table-column>
@@ -547,6 +547,9 @@ export default {
     operation() {
       return this.operationBtn({
         edit: {
+          conditions: ({ row, index, column }) => {
+            return row.examineStatus != 'OK'
+          },
           btnType: 'text',
           click: ({ row, index, column }) => {
             this.openForm('edit', row.orderId)
@@ -605,6 +608,7 @@ export default {
     formCancel() {
       this.formVisible = false
       this.$refs?.formRef?.resetFields()
+      this.formData.orderId = '';
       this.formData.fileUrl = '';
       this.goodsList = [];
       this.$data.formRef = this.$options.data().formRef
@@ -803,9 +807,9 @@ export default {
         specsName: '', // 规格名称
         unit: '', // 单位
         num: '', // 订单数量
-        insideQty: '', // 内机数量
-        outQty: '', // 外机数量
-        partsQty: '', // 配件数量
+        insideNum: '', // 内机数量
+        outNum: '', // 外机数量
+        partsNum: '', // 配件数量
         price: '', // 单价
         amount: '', // 金额
         stockQty: '', // 当前库存
@@ -833,9 +837,9 @@ export default {
       this.goodsList[index].goodsName = item.goodsName;
       this.goodsList[index].specsName = item.specsName;
       this.goodsList[index].unit = item.unit;
-      this.goodsList[index].insideQty = item.insideQty;
-      this.goodsList[index].outQty = item.outQty;
-      this.goodsList[index].partsQty = item.partsQty;
+      this.goodsList[index].insideNum = item.insideQty;
+      this.goodsList[index].outNum = item.outQty;
+      this.goodsList[index].partsNum = item.partsQty;
       this.goodsList[index].stockQty = item.stockQty;
     },
 

+ 10 - 1
src/views/mallManagement/order/order_list/index.vue

@@ -371,7 +371,15 @@
               
             </el-row>
           </el-form>
-          <div slot="footer" class="dialog-footer">
+
+          <el-tabs v-model="logisticsTab">
+            <el-tab-pane label="发货数量" name="first"></el-tab-pane>
+            <el-tab-pane label="发货条码" name="second"></el-tab-pane>
+          </el-tabs>
+
+          
+
+          <div slot="footer" class="dialog-footer" style="margin-top: 50px;">
             <el-button type="primary" @click="saveLogistics(data.removeTab)">保 存</el-button>
             <el-button @click="cancelLogistics;data.removeTab()">取 消</el-button>
           </div>
@@ -539,6 +547,7 @@ export default {
         workOrder: true,
         exchange: false,
       },
+      logisticsTab: 'first',
       storageList: [],
       companyList: [],
       websiteList: [],