gjy 3 роки тому
батько
коміт
92ff335541

+ 1 - 1
src/views/home/index.vue

@@ -359,7 +359,7 @@
     },
     async mounted() {
       var staffId=JSON.parse(localStorage.getItem('winseaview-userInfo')).content.staffId
-      // getAdminId().toPromise().then(response => {console.log(11111)})
+      getAdminId().toPromise().then(response => {console.log(11111)})
                 this.loading = false
                 // WebSocket
                 // this.$store.dispatch('setAdminId', response.data.data)

+ 1 - 1
src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -83,8 +83,8 @@
               :value="item.contractNo"
             />
             <el-option
-              v-if="!item.reportStatus"
               v-for="item in option"
+              v-if="!item.reportStatus"
               :key="item.constKey"
               :label="item.contractNo"
               :value="item.contractNo"

+ 10 - 6
src/views/statisticalReport/stockSaleOutReportList.vue

@@ -21,10 +21,10 @@
         <el-col style="text-align: right; line-height: 60px; padding-right: 10px" :span="8">
           <el-select v-model="contractNo" placeholder="请选择合同" clearable filterable @change="contractchange"
             maxlength="500" type="input" class="findValue">
-            <el-option v-if="item.reportStatus" v-for="item in options" :key="item.constKey"
+            <el-option  v-for="item in options" v-if="item.reportStatus" :key="item.constKey"
               :label="item.contractNo + '(' + item.reportStatus + ')'" :value="item.contractNo" />
-            <!-- <el-option v-if="!item.reportStatus" v-for="item in options" :key="item.constKey"
-							:label="item.contractNo" :value="item.contractNo" /> -->
+            <el-option  v-for="item in options" v-if="!item.reportStatus" :key="item.constKey"
+							:label="item.contractNo" :value="item.contractNo" />
           </el-select>
         </el-col>
       </el-row>
@@ -651,7 +651,8 @@
         for (var i = 0; i < this.contractNoList.length; i++) {
           if (this.contractNoList[i].contractNo == e) {
             this.orderList = this.contractNoList[i]
-            for (let i = 0; i < this.orderList.tranTaskInfoList.length; i++) {
+            if(this.orderList.tranTaskInfoList){
+              for (let i = 0; i < this.orderList.tranTaskInfoList.length; i++) {
               if (this.orderList.tranTaskInfoList[i].tranProcessInfo) {
                 this.tranProcessInfo.push({
                   label: this.orderList.tranTaskInfoList[i].taskNo + '(' + this.orderList.tranTaskInfoList[i]
@@ -661,8 +662,11 @@
                 })
               }
             }
-            this.activeName = this.tranProcessInfo.name
-            this.tranType = this.tranProcessInfo.tranType
+            this.activeName = this.tranProcessInfo[0].name
+            this.tranType = this.tranProcessInfo[0].tranType
+            }
+            
+            
             if (this.contractNoList[i].depositUrl) {
               this.addressUrlArray = this.contractNoList[i].depositUrl.split(',')
             } else {