123

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

@@ -580,7 +580,6 @@
                 });
                 });
             }
             }
             if (obj.flag == "colorizedPicUrl") {
             if (obj.flag == "colorizedPicUrl") {
-
                 this.$root.getReq("/web/toolCtl/adjustTMSize", { "key": obj.key }).then(function (d) {
                 this.$root.getReq("/web/toolCtl/adjustTMSize", { "key": obj.key }).then(function (d) {
                     that.loading1 = false;
                     that.loading1 = false;
                     that.loading2 = false;
                     that.loading2 = false;

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 v-if="showDetails(scope.$index, scope.row)" style="border:0;color: #0F8EE9;" size="mini"
+                        <el-button v-show="scope.$index" 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-else style="border:0;color: #0F8EE9;margin:0;"
-                            size="mini" @click="goScheme(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>
                     </template>
                     </template>
                 </el-table-column>
                 </el-table-column>
             </el-table>
             </el-table>

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

@@ -225,6 +225,7 @@
     created: function() {
     created: function() {
         if (this.$route.query.channelUserId != "") {
         if (this.$route.query.channelUserId != "") {
             this.$root.channelUserId = this.$route.query.channelUserId;
             this.$root.channelUserId = this.$route.query.channelUserId;
+            console.log(this.$route.query.channelUserId,"11111111111");
         }
         }
     },
     },
     mounted: function() {
     mounted: function() {
@@ -243,7 +244,6 @@
             console.log(that.action, `oooooooooooooooooooooooooooo`);
             console.log(that.action, `oooooooooooooooooooooooooooo`);
         });
         });
         if (this.$root.channelUserId != "" && this.$root.channelUserToken != "") {
         if (this.$root.channelUserId != "" && this.$root.channelUserToken != "") {
-
             this.handleSizeChange();
             this.handleSizeChange();
         }
         }
     },
     },
@@ -283,7 +283,6 @@
             }
             }
         },
         },
         showSup(index, row){
         showSup(index, row){
-
             if (row.itemName == "专家辅助注册") {
             if (row.itemName == "专家辅助注册") {
                 return true;
                 return true;
             } else {
             } else {
@@ -291,12 +290,13 @@
             }
             }
         },
         },
         showDetails(idx,row){
         showDetails(idx,row){
+            console.log(row.deliveryStatusName,`222222222222222`);
             if(row.deliveryStatusName != "待确认注册方案"){
             if(row.deliveryStatusName != "待确认注册方案"){
                 return false;
                 return false;
             }else{
             }else{
                 return true;
                 return true;
             }
             }
-        }
+        },
         goScheme(index, row){
         goScheme(index, row){
             if (row.itemName == "待确认注册方案") {
             if (row.itemName == "待确认注册方案") {
                 return true;
                 return true;

igirl-channel-web/package-lock.json

@@ -76,6 +76,15 @@
       "dev": true,
       "dev": true,
       "optional": true
       "optional": true
     },
     },
+    "MD5": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/MD5/-/MD5-1.3.0.tgz",
+      "integrity": "sha1-PMJm8Oiau2tDpQ85pFnfW/3gskA=",
+      "requires": {
+        "charenc": ">= 0.0.1",
+        "crypt": ">= 0.0.1"
+      }
+    },
     "abbrev": {
     "abbrev": {
       "version": "1.1.1",
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
       "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",