前端 更新 sdy

src/layout/index/top/index.vue

@@ -395,7 +395,6 @@ export default {
         localStorage.removeItem('ws-pf_organMonetaryValue')
         localStorage.removeItem('ws-pf_vessels')
         localStorage.removeItem('ws-pf_isLandBasedFlag')
-        debugger
         await this.$store.dispatch('user/logout')
         this.$router.push(
           process.env.VUE_APP_PACKAGE_ENV === 'ship' ? '/ship_login' : '/login'

src/views/houseSelfCollect/inspectInfo.vue

@@ -99,11 +99,11 @@
                 maxlength="10" size="small" :disabled="disabled2" />
             </ws-form-item>
             <el-row>
-              <ws-form-item label="复检备注" span="2" prop="reMemo" v-if="information == '编辑复检'">
-                <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" />
+              <ws-form-item label="复检备注" span="2" prop="reMemo" v-if="information == '编辑复检' || statusShow == '已复检'">
+                <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-if="statusShow != '已复检'" />
+                <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-else disabled />
               </ws-form-item>
             </el-row>
-
           </ws-info-table>
 
           <div class="title">质检数据</div>
@@ -231,6 +231,7 @@
         num: 0,
         tipFlag: true,
         allowEdit: 0,
+        statusShow :""
       }
     },
     activated() {
@@ -256,11 +257,13 @@
       this.warehouseName = this.$route.query.warehouseName
       this.cangNo = this.$route.query.warehouseNo
       this.count = Number(this.$route.query.count) + 1
+      this.statusShow = this.$route.query.status
       // this.purchasePriceList = this.$route.query.purchasePriceList
       this.id = this.$route.query.id
       if (this.types == 2) {
         this.disabled = true
         this.disabled1 = true
+        this.disabled2 = true
         this.disabledName = true
         this.information = '查看质检'
       } else if (this.types == 3) {
@@ -298,7 +301,6 @@
               postCheck({id:this.id,flag:2})
                 .toPromise()
                 .then((response) => {
-                  debugger
                   if(response == "OK"){
                       this.$message.success('提交成功')
                         this.$router.push({path: 'inspectionManagement' })

src/views/houseSelfCollect/inspectionManagement.vue

@@ -209,7 +209,8 @@
 						warehouseName: this.warehouseName,
 						count: this.warehouseCount,
 						warehouseNo: this.warehouseNo,
-						allowEdit:this.allowEdit
+						allowEdit:this.allowEdit,
+						status:row.status
 					},
 				})
 			},

src/views/login/index.vue

@@ -148,7 +148,7 @@
               <el-form-item prop="companyName">
                 <!-- <el-input v-model="loginForm.companyName" :placeholder="$t('login.verification08')" /> -->
                 <el-select v-model="loginForm.companyName" filterable placeholder="请选择" class="comp-select">
-                  <el-option v-for="item in compOptionList" :key="item.compName" :label="item.compName" :value="item.compName">
+                  <el-option v-for="(item,index) in compOptionList" :key="index" :label="item.compName" :value="item.compName">
                   </el-option>
                 </el-select>
               </el-form-item>

src/views/warehouse/warehouseManagementList.vue

@@ -541,7 +541,6 @@ export default {
                         pro.netWeight += Number(increment)
                         pro.grossWeight = Number((pro.tare + pro.netWeight).toFixed(2))
                         increment = 0
-                        
                          warehousePrint.push(pro)
                           }else{
                             increment -= pro.netWeight