Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/inspectInfo.vue

@@ -567,8 +567,8 @@
         }
         this.inspect.warehouseName = this.warehouseName
         this.inspect.compId = sessionStorage.getItem('ws-pf_compId')
-        this.inspect.qualityInspector = sessionStorage.getItem('ws-pf_staffName')
         if (this.types == 1) {
+          this.inspect.qualityInspector = sessionStorage.getItem('ws-pf_staffName')
           this.$confirm('确定保存质检信息？', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
@@ -598,6 +598,7 @@
               return false
             })
         } else if (this.types == 3) {
+          this.inspect.qualityInspector = sessionStorage.getItem('ws-pf_staffName')
           this.inspect.flag=0
           this.$confirm('确定保存初检信息？', '提示', {
               confirmButtonText: '确定',
@@ -639,7 +640,7 @@
             })
         }else if (this.types == 5) {
           this.inspect.flag=2
-          this.inspect.reInspector=sessionStorage.getItem('ws-pf_roleName') + sessionStorage.getItem('ws-pf_staffName')
+          // this.inspect.reInspector=sessionStorage.getItem('ws-pf_roleName') + sessionStorage.getItem('ws-pf_staffName')
           this.$confirm('确定保存质检信息？', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',

src/views/houseSelfCollect/inspectionManagement.vue

@@ -79,8 +79,6 @@
            <span class="water-left">{{scope.row.buckleMiscellaneous}} </span> 
           <span class="water-line">|</span> 
           <span class="water-right">{{scope.row.reBuckleMiscellaneous ? scope.row.reBuckleMiscellaneous : '未复检'}}</span> 
-           <!-- <div v-if="scope.row.paramType == 1"> <span>{{scope.row.buckleMiscellaneous}} | {{scope.row.reBuckleMiscellaneous ? scope.row.reBuckleMiscellaneous : '未复检'}}</span></div> -->
-         <!-- <div v-else>{{scope.row.reBuckleMiscellaneous}}</div> -->
          </div>
         </template>
        </el-table-column>
@@ -97,7 +95,7 @@
       </el-table-column>
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
-      <el-table-column prop="qualityInspector" label="质检员">
+      <el-table-column prop="qualityInspector" label="质检员" width="100px">
           <template scope="scope">
             <span>{{scope.row.qualityInspector}}</span>
             <span v-if="scope.row.reInspector && scope.row.qualityInspector != scope.row.reInspector">,{{scope.row.reInspector}}</span>
@@ -106,7 +104,7 @@
 
 
       </el-table-column>
-      <el-table-column prop="updateDate" label="质检时间"></el-table-column>
+      <el-table-column prop="updateDate" label="质检时间"  width="90px"></el-table-column>
       <el-table-column prop="status" label="状态">
         <template slot-scope="scope">
           <span v-if='scope.row.confirm=="1"'>
@@ -119,15 +117,14 @@
       </el-table-column>
       <el-table-column width="500" label="操作">
         <template slot-scope="scope">
-          <el-button @click="inspectInfo(scope.row, 2)" v-hasPermission="`acquisitionManagement.acquisitionQuality.view`">查看</el-button>
+           <el-button @click="inspectInfo(scope.row, 2)" v-hasPermission="`acquisitionManagement.acquisitionQuality.view`">查看</el-button>
           <el-button @click="inspectInfo(scope.row, 3)" v-if="scope.row.status=='已初检'&& scope.row.confirm!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.initial`">初检</el-button>
           <div v-show="scope.row.confirm !='1' && scope.row.status == '已复检'" style="display: inline-block;">
            <el-button @click="inspectInfo(scope.row, 5)" v-hasPermission="`acquisitionManagement.acquisitionQuality.con`">确认</el-button></div>
            <el-button @click="inspectInfo(scope.row, 4)" v-if="scope.row.confirm !='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.again`">复检</el-button>
-            <!-- <el-button @click="inspectInfo(scope.row, 3)" v-if="scope.row.status=='已初检'" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">初检</el-button>
-            <el-button @click="inspectInfo(scope.row, 5)" v-if="scope.row.confirm!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">确认</el-button>
-            <el-button @click="inspectInfo(scope.row, 4)" v-if="scope.row.status!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.edit`">复检</el-button> -->
-          <el-button @click="del(scope.row)" v-if="!scope.row.weighingManagement || scope.row.weighingManagement.status=='已质检'" type="danger" v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
+          <div  style="display: inline-block;" v-if="scope.row.weighingManagement&&scope.row.weighingManagement.status=='已质检'">
+            <el-button @click="del(scope.row)" type="danger" v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
+          </div>
           <el-button @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionQuality.print`">打印</el-button>
         </template>
       </el-table-column>
@@ -232,6 +229,7 @@ export default {
       })
     },
     warehouseNameChange(e) {
+      // console.log(e)
       for(let i = 0 ; i < this.warehouseList.length; i++){
         if(this.warehouseList[i].value == e){
            this.warehouseName = this.warehouseList[i].value
@@ -336,6 +334,7 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          console.log(response)
           this.inspect = response.records
           this.deptBudgetTotal = response.total
         })