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

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1130,16 +1130,20 @@ export default {
       if (this.deptBudgetList.goodsName && type != 'water') {
         if (this.deptBudgetList.goodsName.indexOf('潮粮') != -1) {
           this.deptBudgetList.type = '潮粮'
-          this.deptBudgetList.grade = this.gradeList[1].constValue
-				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+          if(!this.deptBudgetList.grade){
+            this.deptBudgetList.grade = this.gradeList[1].constValue
+				    this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+          }
           this.deptBudgetList.imperfectGrain=8
 					this.deptBudgetList.impurity=1
 					this.deptBudgetList.mildewGrain=2
 					this.deptBudgetList.jiaorenli=0
         } else {
           this.deptBudgetList.type = '干粮'
-          this.deptBudgetList.grade = this.gradeList[1].constValue
-				  this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+          if(!this.deptBudgetList.grade){
+            this.deptBudgetList.grade = this.gradeList[1].constValue
+				    this.deptBudgetList.gradeKey = this.gradeList[1].constKey
+          }
           this.deptBudgetList.imperfectGrain=8
 					this.deptBudgetList.impurity=1
 					this.deptBudgetList.mildewGrain=2
@@ -1179,7 +1183,7 @@ export default {
         })
           .toPromise()
           .then((response) => {
-            debugger
+            // debugger
             if (this.deptBudgetList.paramType == '1') {
               if(this.deptBudgetList.buckleMiscellaneous){
                 this.deptBudgetList.tidalGrainPrice = parseFloat(parseFloat(response) - parseFloat(this.deptBudgetList
@@ -4029,9 +4033,12 @@ export default {
       }
     },
     selectpackingMethod(e) {
+      this.$set( this.deptBudgetList,'grade',e)
+      console.log(e,this.deptBudgetList)
       for (var i = 0; i < this.gradeList.length; i++) {
         if (this.gradeList[i].constValue == e) {
-          this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+          console.log(11111)
+          this.$set( this.deptBudgetList,'gradeKey',this.gradeList[i].constKey)
         }
       }
       this.waterContentChange()

src/views/personnelManagement/checkWorkList.vue

@@ -39,7 +39,8 @@
       label="日期"
       width="180">
       <template slot-scope="scope">
-        <span style="margin-left: 10px">{{ scope.row.createDate.split(" ")[0] }}</span>
+        <span v-if="!scope.row.leaveType" style="margin-left: 10px">{{ scope.row.createDate.split(" ")[0] }}</span>
+        <span v-else style="margin-left: 10px">{{ scope.row.clockDay }}</span>
       </template>
 
     </el-table-column>
@@ -49,7 +50,8 @@
       width="180">
       <template slot-scope="scope">
         <span v-if="scope.row.toClockDate" style="margin-left: 10px">{{ scope.row.toClockDate.split(" ")[1] }}</span>
-        <span v-else-if="scope.row.status=='补卡成功'&&scope.row.supplementClockType=='1'" style="margin-left: 10px">已补卡</span>
+        <span v-else-if="scope.row.status=='补卡成功'&&scope.row.supplementClockType=='1'" style="margin-left: 10px;">已补卡</span>
+        <span v-else-if="scope.row.leaveType" style="margin-left: 10px;">{{scope.row.leaveType}}</span>
       </template>
     </el-table-column>
     <el-table-column
@@ -57,7 +59,8 @@
       label="下班打卡时间">
       <template slot-scope="scope">
         <span v-if="scope.row.offClockDate" style="margin-left: 10px">{{ scope.row.offClockDate.split(" ")[1] }}</span>
-        <span v-else-if="scope.row.status=='补卡成功'&&scope.row.supplementClockType=='3'" style="margin-left: 10px">已补卡</span>
+        <span v-else-if="scope.row.status=='补卡成功'&&scope.row.supplementClockType=='3'" style="margin-left: 10px;">已补卡</span>
+        <span v-else-if="scope.row.leaveType" style="margin-left: 10px;">{{scope.row.leaveType}}</span>
       </template>
     </el-table-column>
   </el-table>
@@ -101,9 +104,8 @@
   </el-table>
 </div>
 <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" :page-size="pageSize"  layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal"></el-pagination>
-   
+        :page-sizes="[10, 30, 50, 100, 500, 1000, 9999]" :page-size="pageSize"  layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+        <!-- :total="deptBudgetTotal" -->
   <!-- <div class="content">
     <div v-for="(item,index) in tableData">
       <div class="row">

src/views/universalityAudit/auditprint.vue

@@ -40,6 +40,12 @@
           </el-table-column>
           <el-table-column prop="type" label="类型">
           </el-table-column>
+          <el-table-column prop="warehouseName" label="仓库名">
+          </el-table-column>
+          <el-table-column prop="payerHeader" label="付款方名头">
+          </el-table-column>
+          <el-table-column prop="amountMoney" label="金额">
+          </el-table-column>
           <el-table-column prop="status" label="状态">
             <template slot-scope="scope">{{ scope.row.approveStatus ? scope.row.approveStatus : scope.row.status }}</template>
           </el-table-column>

src/views/warehousenew/inventoryCheck.vue

@@ -48,9 +48,9 @@
             `warehouseManagement.warehousingOrder.View`
           ">盘亏
         </ws-button>
-        <ws-button :type="searchType === '1' ? 'primary' : ''" @click="handle('1')" v-hasPermission="
+        <!-- <ws-button :type="searchType === '1' ? 'primary' : ''" @click="handle('1')" v-hasPermission="
         `warehouseManagement.warehousingOrder.View`">待审核
-        </ws-button>
+        </ws-button> -->
         </el-col>
         <el-col style='text-align:right;' :span="12">
           
@@ -87,8 +87,8 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="goodsSource" label="货源" width="80"></el-table-column>
-        <el-table-column prop="deliveryWarehouse" label="发货库" width="80"></el-table-column>
+        <el-table-column prop="goodsSource" label="货源" width="150"></el-table-column>
+        <el-table-column prop="deliveryWarehouse" label="发货库" width="200"></el-table-column>
         <el-table-column prop="goodsName" label="货名" width="80">
         </el-table-column>
         <el-table-column prop="inWarehouseWeight1"  width="130" class="table_td" label="入库重量（吨）"></el-table-column>
@@ -100,24 +100,22 @@
         </template>
         </el-table-column>
         <el-table-column prop="surplusWeight" width="130" class="table_td" label="剩余重量（吨）"></el-table-column>
-        <el-table-column prop="approveStatus" label="状态" width="90">
+        <!-- <el-table-column prop="approveStatus" label="状态" width="90">
           <template slot-scope="scope">
             <template>
-              <!-- <span v-if='scope.row.approveStatus'>{{ scope.row.approveStatus }}</span> -->
-              <!-- <span v-else>{{ scope.row.inventoryStatus }}</span> -->
               <span>{{ scope.row.inventoryStatus }}</span>
             </template>
             <img v-if="scope.row.taskStatus == '执行中'" width="17" height="18"
               style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
               @click="editClick(scope.row)" alt />
           </template>
-        </el-table-column>
+        </el-table-column> 
         <el-table-column prop="seller" label="操作" width="230">
           <template slot-scope="scope">
              <ws-button type="primary" v-if="scope.row.inventoryStatus == '待审核'" @click="aduit(scope.row)" v-hasPermission="`warehouseManagement.warehousingOrder.adiut`">
               审核</ws-button>
           </template>
-        </el-table-column>
+        </el-table-column>-->
       </el-table>
     </div>
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
@@ -569,7 +567,7 @@
             return
           }
         if(this.title=='盘盈'){
-          this.form.plValue=(this.form.num-this.form.surplusWeight).toFixed(2)
+          this.form.plValue=Math.floor((this.form.num-this.form.surplusWeight)*1000)/1000
           this.form.flag=0
           if(this.form.num<this.form.surplusWeight){
             this.$notify.warning({
@@ -581,7 +579,7 @@
           title='确定提交盘盈数据？'
         }
         if(this.title=='盘亏'){
-          this.form.plValue=(this.form.num-this.form.surplusWeight).toFixed(2)
+          this.form.plValue=Math.floor((this.form.num-this.form.surplusWeight)*1000)/1000
           this.form.flag=1
           if(this.form.num>this.form.surplusWeight){
             this.$notify.warning({
@@ -743,7 +741,7 @@
                 //    data[q].surplusWeight=(data[q].inWarehouseWeight/1000)-data[q].outWarehouseWeight+data[q].profitAndLoss
                 // }else{
                   data[q].inWarehouseWeight1=data[q].inWarehouseWeight.toFixed(3)
-                  data[q].surplusWeight=parseInt((data[q].inWarehouseWeight-data[q].outWarehouseWeight+data[q].profitAndLoss)*100)/100
+                  data[q].surplusWeight=(data[q].inWarehouseWeight-data[q].outWarehouseWeight+data[q].profitAndLoss).toFixed(3)
                 // }
                 data[q].select=false
                 data[q].weightedit=false