123

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html

@@ -88,13 +88,13 @@
                 </el-table-column>
                 </el-table-column>
                 <el-table-column prop="address" label="操作">
                 <el-table-column prop="address" label="操作">
                     <template slot-scope="scope">
                     <template slot-scope="scope">
-                        <el-button style="border:0;color: #0F8EE9;" size="mini"
+                        <el-button v-if="showDetails(scope.$index, scope.row)" style="border:0;color: #0F8EE9;" size="mini"
                             @click="viewDetails(scope.$index, scope.row)">&nbsp;&nbsp;&nbsp;详情&nbsp;&nbsp;&nbsp;&nbsp;
                             @click="viewDetails(scope.$index, scope.row)">&nbsp;&nbsp;&nbsp;详情&nbsp;&nbsp;&nbsp;&nbsp;
                         </el-button>
                         </el-button>
                         <el-button v-show="showSelf(scope.$index, scope.row)" style="border:0;color: #0F8EE9;margin:0;"
                         <el-button v-show="showSelf(scope.$index, scope.row)" style="border:0;color: #0F8EE9;margin:0;"
                             size="mini" @click="uploadMaterials(scope.$index, scope.row)">上传材料</el-button>
                             size="mini" @click="uploadMaterials(scope.$index, scope.row)">上传材料</el-button>
-                        <el-button v-show="showSup(scope.$index, scope.row)" style="border:0;color: #0F8EE9;margin:0;"
-                            size="mini" @click="goScheme(scope.$index, scope.row) = true">确认注册方案</el-button>
+                        <el-button v-else style="border:0;color: #0F8EE9;margin:0;"
+                            size="mini" @click="goScheme(scope.$index, scope.row)">确认注册方案</el-button>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
             </el-table>
             </el-table>

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js

@@ -219,7 +219,7 @@
                 stuff: {},
                 stuff: {},
                 showUploadStuff: false,
                 showUploadStuff: false,
                 currentOrderNo: "",
                 currentOrderNo: "",
-                currentOrderType:"",
+                currentOrderType: "",
             }
             }
         },
         },
     created: function() {
     created: function() {
@@ -267,8 +267,8 @@
                     deliveryOrderNo: row.deliveryOrderNo,
                     deliveryOrderNo: row.deliveryOrderNo,
                     channelUserId: this.$root.channelUserId,
                     channelUserId: this.$root.channelUserId,
                     itemName: this.currentOrderType,
                     itemName: this.currentOrderType,
-                    deliveryStatus:this.deliveryStatus,
-                    totalSum:row.totalSum,
+                    deliveryStatus: this.deliveryStatus,
+                    totalSum: row.totalSum,
                 }
                 }
             });
             });
         },
         },
@@ -290,13 +290,25 @@
                 return false;
                 return false;
             }
             }
         },
         },
+        showDetails(idx,row){
+            if(row.deliveryStatusName != "待确认注册方案"){
+                return false;
+            }
+        }
         goScheme(index, row){
         goScheme(index, row){
+            if (row.itemName == "待确认注册方案") {
+                return true;
+            } else {
+                return false;
+            }
+            this.$router.push({
 
 
+            });
         },
         },
         handleSizeChange(){
         handleSizeChange(){
             if (this.$root.channelUserId != "") {
             if (this.$root.channelUserId != "") {
                 this.indentInfo.pageIndex = this.currentPage;
                 this.indentInfo.pageIndex = this.currentPage;
-                var obj = this.$root.copyParams(this.indentInfo, "getTmOrderList", "/action/tmOrder/springBoard","yes","yes");
+                var obj = this.$root.copyParams(this.indentInfo, "getTmOrderList", "/action/tmOrder/springBoard", "yes", "yes");
                 this.$root.loading = true;
                 this.$root.loading = true;
                 this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
                 this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
                     this.$root.loading = false;
                     this.$root.loading = false;
@@ -464,7 +476,7 @@
             console.log(this.stuff);
             console.log(this.stuff);
             this.stuff.deliveryOrderNo = this.currentOrderNo;
             this.stuff.deliveryOrderNo = this.currentOrderNo;
             this.stuff.name = this.currentName;
             this.stuff.name = this.currentName;
-            var obj = this.$root.copyParams(this.stuff, "updateCustomerInfo", "/action/tmOrder/springBoard","yes","yes");
+            var obj = this.$root.copyParams(this.stuff, "updateCustomerInfo", "/action/tmOrder/springBoard", "yes", "yes");
             this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
             this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((res) => {
                 console.log(res);
                 console.log(res);
                 if (res.status == 0) {
                 if (res.status == 0) {