08/10

src/main/vue/src/components/ImgItemOrder.vue

@@ -180,7 +180,6 @@
 
             <div class="check" v-if="imgStyle=='uploadAlbum'">
                 <el-button
-                    v-if="img.statusFlag!=2"
                     @click="delFinishImg"
                     type="danger"
                     icon="el-icon-delete"
@@ -189,7 +188,6 @@
                     size="mini"
                 ></el-button>
                 <el-button
-                    v-if="img.detailRemark"
                     @click="dialogFormVisible=true"
                     icon="el-icon-info"
                     circle

src/main/vue/src/components/OrderItem.vue

@@ -134,7 +134,7 @@
             <span style="margin-left:20px;">{{info.remark}}</span>
         </div>
 
-        <div class="repairItem" v-for="(item,index) in info.orderRepairList" v-if="item.statusFlag>0">
+        <div class="repairItem" v-for="(item,index) in info.orderRepairList" v-if="item.statusFlag>0" >
             <div class="box">
                 {{index+1}}
             </div>

src/main/vue/src/pages/OrderUploadAlbum.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="container">
-        <div class="top" v-if="orderInfo.productInfo">
+        <div class="top" >
             <el-radio-group
                 v-model="radio1"
                 style="margin-right:10px;"
@@ -11,7 +11,7 @@
                 <el-radio-button label="放大"></el-radio-button>
             </el-radio-group>
             <span>订单号:{{orderInfo.orderCode}}</span>
-            <span style="margin-left:20px;">{{orderInfo.productInfo.title}}</span>
+            <span style="margin-left:20px;">{{orderInfo.productName}}</span>
             <!-- <span style="font-size:14px;margin-left:20px;">已上传/总张数：{{orderImage.length}} / {{allNum}}，最多上传{{allNum*2}}张</span> -->
             <!-- <span v-if="canUploadNum<0" style="font-size:14px;color:red;margin-left:10px">超出{{0-canUploadNum}}张</span> -->
             <el-button
@@ -125,7 +125,7 @@
 </template>
 <script>
 import { mapState } from "vuex";
-import imgItem from "../components/ImgItem";
+import imgItem from "../components/ImgItemOrder";
 import formValidator from "../formValidator";
 import { OrderStatus, PayMode, OrderAlbumStatus } from "../Constants";
 const baseUrl =

src/main/vue/src/pages/OrderUploadChange.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="container" v-loading="loading" element-loading-text="上传图片中，时间或许会很久，请耐心等待哦！">
-        <div class="top" v-if="orderInfo.productInfo">
+        <div class="top">
             <el-radio-group
                 v-model="radio1"
                 style="margin-right:10px;"
@@ -13,7 +13,7 @@
             </el-radio-group>
 
             <span>订单号:{{orderInfo.orderCode}}</span>
-            <span style="margin-left:20px;">{{orderInfo.productInfo.title}}</span>
+            <span style="margin-left:20px;">{{orderInfo.productName}}</span>
 
             <el-button
                 style="float:right;margin:15px 10px 0 20px;width:100px"
@@ -524,14 +524,19 @@ export default {
                                 "，至少需要上传" +
                                 this.orderInfo.fandaAmount +
                                 "张";
-                            if (
-                                res2.data.albumQuantity +
+                                console.log(  res2.data.albumQuantity +
                                     this.orderInfo.fandaAmount -
-                                    res2.data.needAlbum >=
-                                this.orderInfo.fandaAmount
+                                    res2.data.needAlbum )
+                            if (
+                              res2.data.albumQuantity -
+                                    res2.data.needAlbum>=
+                                 this.orderInfo.fandaAmount
                             ) {
                                 res2.data.needAlbum = 0;
                             }
+                            else{
+                                  res2.data.needAlbum = 1;
+                            }
                         } else {
                             this.albumTip =
                                 "放大：已上传/总张数：" +