Merge branch 'master' of http://47.108.172.52:3000/dayou/item-management-web

src/views/finance/outWarehouseCheck.vue

@@ -86,7 +86,7 @@
         </el-table-column>
         <el-table-column label="财务审核意见" align="center"  show-overflow-tooltip>
           <template slot-scope="{row}">
-            <span>{{ row.financeReply==null?'-':row.departmentReply}}</span>
+            <span>{{ row.financeReply==null?'-':row.financeReply}}</span>
           </template>
         </el-table-column>
         <el-table-column v-if="taskId"
@@ -94,7 +94,7 @@
           label="操作">
           <template slot-scope="{row}">
             <PermissionButton menu-code="_views_do_out_warehouse_check" class-name="filter-item" type="success"
-              :page-jump="false" round size="mini" @click="doCheck(row.id)" :disabled="(checkType==0&&row.departmentCheckState!=null)" />
+              :page-jump="false" round size="mini" @click="doCheck(row.id)" :disabled="!(checkType==1 || (row.departmentCheckState==null) || (row.departmentCheckState!=null && row.financeCheckState==='审核拒绝'  ))" />
             <PermissionButton menu-code="_views_do_out_warehouse_finance_check" class-name="filter-item" type="success"
               :page-jump="false" round size="mini" @click="doCheck(row.id)" 
               :disabled="!(row.financeCheckState==null && row.departmentCheckState!='审核拒绝')" />
@@ -110,7 +110,7 @@
               :rules="{required: true, message: '审核结果不能为空', trigger: 'blur'}">
                     <el-select v-model="checkDTO.state" placeholder="请选择" style="width:300px">
                       <el-option label="审核通过" value="审核通过" />
-                      <el-option v-if="checkType==0" label="审核拒绝" value="审核拒绝" />
+                      <el-option label="审核拒绝" value="审核拒绝" />
                     </el-select>
               </el-form-item >
             </el-col>
@@ -204,7 +204,7 @@ export default {
     },
     getList() {
       this.listQuery.keyword = this.$route.query.rNo;
-      this.$api.productionOutWarehouse.list(Object.assign({businessType:this.businessType}, this.listQuery)).then(res=>{
+      this.$api.productionOutWarehouse.list(Object.assign({businessType:this.businessType,nCode:this.nodeCode}, this.listQuery)).then(res=>{
         if (res.code ===200){
             this.pageData = res.data;
         }

src/views/home/index.vue

@@ -4,7 +4,6 @@
     <el-dialog :visible.sync="dialogFormVisible" :close-on-click-modal="false" :show-close="false" width="600px" custom-class="customClass">
       <div slot="title" class="dialog-title">
         <el-row>
-          <el-icon class="el-icon-message-solid"></el-icon>
           <span>请先修改密码,再登录系统</span>
         </el-row>
       </div>

src/views/major/detail.vue

@@ -975,7 +975,7 @@
               <el-form label-position="left" :model="props.row" class="form-container" ref="productionFrom">
                 <div>
                   <el-row class="row-style">
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                    <el-col :xs="24" :sm="12" :lg="12" :span="6">
                       <el-form-item  
                           prop="name"
                           :rules="{required: true, message: '项目不能为空', trigger: 'blur'}"
@@ -984,7 +984,7 @@
                           <el-input v-model="props.row.name" class="filter-item"  disabled readonly/>
                         </el-form-item>
                       </el-col>
-                      <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                      <el-col :xs="24" :sm="12" :lg="12" :span="6">
                         <el-form-item  prop="clientName"
                           :rules="{required: true, message: '委托方不能为空', trigger: 'blur'}"
                           label-width="120px"
@@ -992,21 +992,30 @@
                           <el-input v-model="props.row.clientName" class="filter-item"  disabled readonly />
                         </el-form-item>
                       </el-col>
+                    </el-row><el-row class="row-style">
+                      <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                        <el-form-item  prop="clientAddress"
+                          :rules="{required: true, message: '委托方地址不能为空', trigger: 'blur'}"
+                          label-width="140px"
+                          class="postInfo-container-item" label="委托方地址：">
+                          <el-input v-model="props.row.clientAddress" class="filter-item"   disabled readonly/>
+                        </el-form-item>
+                      </el-col>
                       <el-col :xs="24" :sm="12" :lg="6" :span="6">
                         <el-form-item  prop="clientTel"
                           :rules="{required: true, message: '委托方电话不能为空', trigger: 'blur'}"
-                          label-width="120px"
+                          label-width="140px"
                           class="postInfo-container-item" label="委托方电话：">
                           <el-input v-model="props.row.clientTel" class="filter-item"   disabled readonly/>
                         </el-form-item>
                       </el-col>
                       <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                        <el-form-item  prop="clientAddress"
-                          :rules="{required: true, message: '委托方地址不能为空', trigger: 'blur'}"
-                          label-width="120px"
-                          class="postInfo-container-item" label="委托方地址：">
-                          <el-input v-model="props.row.clientAddress" class="filter-item"   disabled readonly/>
+                      <el-form-item  prop="qrCode"
+                        label-width="140px"
+                        class="postInfo-container-item" label="二维码：">
                         </el-form-item>
+                        <img style="width:200px;height:200px; display:flex ;position:absolute;top:0;right:0"
+                        :src="props.row.qrCode" alt="NULL" />                    
                       </el-col>
                   </el-row>
                   <el-row class="row-style">
@@ -1091,13 +1100,7 @@
                         class="postInfo-container-item">
                         </el-form-item>
                     </el-col>
-                    <el-col :xs="24" :sm="12" :lg="6" :span="6">
-                      <el-form-item  prop="qrCode"
-                        label-width="120px"
-                        class="postInfo-container-item" label="二维码：">
-                        </el-form-item>
-                        <img style="width:130px;height:120px; display:flex ;position:absolute;top:0;right:0" :src="props.row.qrCode" alt="NULL" />
-                    </el-col>
+                  
                   </el-row>
                   <el-row class="row-style">
                     <el-col :xs="24" :sm="12" :lg="18" :span="6">
@@ -2161,6 +2164,7 @@
   import YDetailPageLayout from '@/components/YDetailPageLayout/index_detail'
   import WorkflowBoard from '@/components/workflowBoard'
   import {isNumber,phoneNumber,postiveInteger,isIdNumber} from '@/utils/validate'
+import { element } from 'screenfull';
 
   export default {
     name: 'majorDetail',

src/views/major/todoDetail.vue

@@ -1423,7 +1423,7 @@
     </el-dialog>
     <el-dialog :visible.sync="warehouseDialog" width="25%" center top="35vh" custom-class="doWarehouseClass"
       @closed="cleanWareHouseProductionType()">
-      <ScanEntry ref="scanEntry" @scanEntryFun="handleScanEntry" label="请扫描二维码或输入报告号" />
+      <ScanEntry ref="scanEntry" @scanEntryFun="handleScanEntry" label="请扫描二维码或输入产品号" />
       <span slot="footer" class="dialog-footer">
         <el-button @click="warehouseDialog = false">取 消</el-button>
         <el-button type="primary" @click="doWareHouse()">确 定</el-button>
@@ -1587,9 +1587,9 @@ export default {
         if (evaluate.includes(nodeCode)) {
           return 'evaluate'
         }
-        // if (check.includes(nodeCode)){
-        //   return 'quality'
-        // }
+        if (check.includes(nodeCode)){
+          return 'quality'
+        }
         return 'producution'
       },
       set() { }