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

src/api/V2/personnelManagement/index.js

@@ -1,2 +1,4 @@
 export const API_GET_PERSON_LIST = '/clockInfo/selectClockInfoPc'
-export const API_GET_PERSON_LIST1 = '/clockInfo/selectClockInfo'
+export const API_GET_SUPP_LIST = '/clockInfo/selectClockInfoPc'
+//请假列表
+export const API_GET_LEAVE_LIST = '/leaveInfo/selectLeaveInfoPc'

src/model/personnelManagement/index.js

@@ -2,7 +2,8 @@ import { errorCatcher, errorHandle, filter } from 'base-core-lib'
 import { appRx } from '../defalutConfig/indexRx'
 import {
     API_GET_PERSON_LIST,
-    API_GET_PERSON_LIST1
+    API_GET_SUPP_LIST,
+    API_GET_LEAVE_LIST,
 } from '@/api/V2/personnelManagement'
 import {
     API_GET_DEPT,
@@ -13,5 +14,7 @@ export const getList = appRx.get(API_GET_PERSON_LIST, errorCatcher, errorHandle,
     // export const addList = appRx.post(API_POST_ADD_CONTRACT_TENANT, errorCatcher, errorHandle, filter)
     // 获取部门列表
 export const getDeptList = appRx.get(API_GET_DEPT, errorCatcher, errorHandle, filter)
-
-export const getList1 = appRx.get(API_GET_PERSON_LIST1, errorCatcher, errorHandle, filter)
+//补卡列表
+export const getSuppList = appRx.get(API_GET_SUPP_LIST, errorCatcher, errorHandle, filter)
+//请假列表
+export const getLeavePc = appRx.get(API_GET_LEAVE_LIST, errorCatcher, errorHandle, filter)

src/views/contractManagement/acquisitionContract.vue

@@ -358,7 +358,7 @@
       }
     },
     activated() {
-      this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
+      // this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
       //cg.viewBudget
       //cg.viewSpareMoney
       // this.getVesselData();

src/views/contractManagement/purchaseContract.vue

@@ -357,6 +357,7 @@
       }
     },
     activated() {
+      console.log(this.global)
       // this.applstatus=this.global.hasPermission('contractManagement.buyContract.buyContractInfo.appl')
       //cg.viewBudget
       //cg.viewSpareMoney

src/views/contractManagement/salesContract.vue

@@ -392,7 +392,7 @@
       }
     },
     activated() {
-      this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
+      // this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
       //cg.viewBudget
       //cg.viewSpareMoney
       // this.getVesselData();

src/views/houseSelfCollect/inspectInfo.vue

@@ -372,7 +372,7 @@
             formdata.append('file', b);
             axios({
               method: 'post',
-              url: 'global.uploadPath',
+              url: this.global.uploadPath,
               data: formdata
             }).then((response) => {
               //编辑接口
@@ -405,7 +405,7 @@
             formdata.append('file', b);
             axios({
               method: 'post',
-              url: 'global.uploadPath',
+              url: this.global.uploadPath,
               data: formdata
             }).then((response) => {
               //编辑接口

src/views/personnelManagement/cardReplacementManagement.vue

@@ -12,16 +12,16 @@
     <div class="center">
       <el-row style='margin-bottom:10px;'>
         <el-col :span="18">
-          <el-button style="margin-left:10px" @click="typeChange('')" :type="searchType == ''?'primary':''">全部</el-button>
-          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">待审核</el-button>
-          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">已通过</el-button>
-          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">已驳回</el-button>
+          <el-button style="margin-left:10px" @click="typeChange('1')" :type="searchType == '1'?'primary':''">全部</el-button>
+          <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">待审核</el-button>
+          <el-button @click="typeChange(4)" :type="searchType == 4?'primary':''">已通过</el-button>
+          <el-button @click="typeChange(3)" :type="searchType == 3?'primary':''">已驳回</el-button>
         </el-col>
         <el-col style='text-align:right;' :span="6">
         </el-col>
       </el-row>
       <div class="fromdata">
-        <el-table :data="tableData">
+        <el-table :data="suppData">
           <el-table-column type="index" label="序号">
             <template scope="scope">
               <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -32,23 +32,24 @@
           </el-table-column>
           <el-table-column prop="dept" label="部门">
           </el-table-column>
-          
-          <el-table-column  prop="driverName" label="备注">
+          <el-table-column prop="supplementClockType" label="补卡类型">
+            <template slot-scope="scope">
+              <span v-if="scope.row.supplementClockType == '1'">上班补卡</span>
+              <span v-else>下班补卡</span>
+            </template>
+          </el-table-column>
+          <el-table-column  prop="reasonForApplication" label="申请理由">
           </el-table-column>
           <el-table-column prop="approveStatus" width="100" label="状态">
             <template slot-scope="scope">
-              <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span><span v-else>{{scope.row.travelStatus}}</span>
+              <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span>
+              <span v-else>{{scope.row.status}}</span>
             </template>
           </el-table-column>
           <el-table-column prop="address" label="操作">
             <template slot-scope="scope">
-              <el-button @click="look(scope.row)" type="primary">查看</el-button>
-             
-              <!-- <el-button v-if='scope.row.approveStatus=="待确认"' @click="accomplish(scope.row)" type="primary">完成</el-button> -->
               <el-button v-if='scope.row.approveStatus' @click="pass(scope.row)" type="primary">通过</el-button>
               <el-button v-if='scope.row.approveStatus' @click="reject(scope.row)" type="primary">驳回</el-button>
-              <!-- <el-button v-if='scope.row.status=="已驳回"' @click="expenseedit(scope.row)" type="primary">编辑</el-button> -->
-              <el-button v-if='!scope.row.approveStatus&&scope.row.expensesType==2&&scope.row.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -78,11 +79,8 @@
 <script>
   import WsUpload from '@/components/WsUpload'
   import {
-    getList1,
+    getSuppList,
   } from '@/model/personnelManagement/index'
-  import {
-    getfielfillinginfo,
-  } from '@/model/profitable/index'
   import {
     woekflowhandle
   } from '@/model/tasksport/index'
@@ -93,7 +91,7 @@
     data() {
       return {
         value: '',
-        tableData: [],
+        suppData: [],
         deptBudgetTotal: 0,
         currentPage: 1,
         pageSize: 10,
@@ -103,7 +101,7 @@
         form:{},
         dialogVisible2:false,
         deptCircularPage: {},
-        searchType:'',
+        searchType:'1',
         searchKeyWord:'',
         strokeType:'1',
         title:'附件',
@@ -118,51 +116,15 @@
       this.getList()
     },
     methods: {
-      handlerecord(row){
-        if(row.expensesType==1){
-          this.title1='收款审核记录'
-        }else{
-          this.title1='请款审核记录'
-        }
-        getAuditRecord({ id: row.id,
-            workflowId: row.workflowId}).toPromise()
-                .then((response) => {
-                  this.recordList=response
-                  this.dialogVisible1=true
-                }).catch((response) => {})
-      },
       returnsales(){
         this.$router.go(-1)
       },
       handleClose() {
         this.fujianshow = false
       },
-      fujian(row) {
-        this.id = row.id
-        this.fujianshow = true
-        if(row.addressUrl){
-         this.appendixIdss=row.addressUrl
-        }
-      },
-      look(row){
-        this.form=row
-        this.dialogVisible1=true
-      },
-      
-      strokeTypeChange(num){
-        this.strokeType = num
-        this.getList()
-      },
-      typeChange(num){
-        this.searchType = num
-        this.getList()
-      },
-      edit(row){
-        this.$router.push({name:'cashoutedit',query:{id:row.id}})
-      },
       pass(row){
         if(row.taskId){
-          this.$confirm('确认通过请款信息？', '提示', {
+          this.$confirm('确认通过补卡申请？', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -228,64 +190,33 @@
           })
         }
       },
-      payment(row){
-        if(localStorage.getItem('ws-pf_roleName')=='出纳'){
-          this.$router.push({name:'payment',query:{id:row.id}})
-        }else{
-          this.$message({
-            message: '暂无此权限!',
-            type: 'warning',
-          })
-        }
-        
-      },
-      allot(row){
-        if(localStorage.getItem('ws-pf_roleName')=='销售内勤'||localStorage.getItem('ws-pf_roleName')=='采购内勤'){
-          this.$router.push({name:'expenseallot',query:{id:row.id}})
+      typeChange(num) {
+        if (num == 1) {
+          this.searchType = 1
+        } 
+        else if (num == 2) {
+          this.searchType = 2
+        }else if(num == 3){
+          this.searchType = 3
         }else{
-          this.$message({
-            message: '暂无此权限!',
-            type: 'warning',
-          })
+          this.searchType = 4
         }
+        this.currentPage = 1
+        this.getList()
       },
-      cashout(){
-        this.$router.push({name:'cashout'})
-      },
-      storageCharge(){
-        this.$router.push({name:'storageCharge'})
-      },
-      receipt(){
-        this.$router.push({name:'receipt'})
-      },
-      // inventory(){
-      //   this.$router.push({name:'contractinventory'})
-      // },
       getList() {
-        getList1({
-            // warehouseType: 1,
+        getSuppList({
+            searchType: this.searchType,
             currentPage: this.currentPage,
             pageSize: this.pageSize,
             compId: localStorage.getItem('ws-pf_compId'),
           })
           .toPromise()
           .then(response => {
-            this.tableData = response.records
+            this.suppData = response.records
            this.deptBudgetTotal = response.total
           })
       },
-      changeDate(){
-        if(this.value){
-          this.startDate = this.value[0]
-          this.endDate = this.value[1]
-        }
-        this.getList()
-      },
-      pickerOptions() {},
-      find() {
-        this.getList()
-
-      },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)
         this.pageSize = val

src/views/personnelManagement/component/router/route.js

@@ -8,7 +8,7 @@ const checkWorkListRouter = {
     alwaysShow: true, // will always show the root menu
     meta: {
         title: '人事管理',
-        module: 'customerManagement.customer.customerInfo',
+        module: 'kaoqin',
         icon: '-kehuguanli'
     },
     children: [{
@@ -34,7 +34,7 @@ const checkWorkListRouter = {
             meta: {
                 title: '请假管理',
                 shortcutEntrance: 'leaveList',
-                module: 'customerManagement.customer.customerInfo',
+                module: 'kaoqin.qingjia.view',
                 permissicon: [],
                 keepAlive: true,
                 // module: 'procurement.sparepart.applDetail'
@@ -49,7 +49,7 @@ const checkWorkListRouter = {
             meta: {
                 title: '补卡管理',
                 shortcutEntrance: 'leaveList',
-                module: 'customerManagement.customer.customerInfo',
+                module: 'kaoqin.buka.view',
                 permissicon: [],
                 keepAlive: true,
                 // module: 'procurement.sparepart.applDetail'

src/views/personnelManagement/leaveList.vue

@@ -1,10 +1,14 @@
-//客户管理
+//请假管理
 <template>
   <div>
     <BaseHeaderLayout :leftSpan="8">
-      <template slot="left"> </template>
-      <template slot="left">
-        <ws-input v-model="searchKeyWord" placeholder="可按客户名称、电话查找" clearable maxlength="500" type="input"
+      <template slot="left"> 
+        <el-date-picker v-model="value2" type="daterange" align="left" unlink-panels range-separator="至"
+          start-placeholder="开始日期" end-placeholder="结束日期">
+        </el-date-picker>
+      </template>
+      <template slot="right"> 
+        <ws-input v-model="searchKeyWord" placeholder="可按请假人名查找" clearable maxlength="500" type="input"
           class="findValue" @keyup.enter.native="find()"></ws-input>
         <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
@@ -12,137 +16,23 @@
               top: 0px;
               left: -8px;
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
-
-        <!--设置默认定金比例-->
-        <el-button class="bg-bottom" type="primary" size="small" @click="installRatio()">
-          默认定金比例</el-button>
-        <el-dialog width="25%" title="设置默认定金比例" :visible.sync="outerVisibleDefaultEdit" :append-to-body="true">
-          <div style="width: 50%">
-            <div class="dingjin">定金比例(元/吨)</div>
-            <el-input type="textarea" :rows="2" placeholder="请输入定金比例" v-model="depositRatio">
-            </el-input>
-          </div>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="outerVisibleDefaultEdit = false">取 消</el-button>
-            <el-button type="primary" @click="editDefaultDepositRatio()">确 定</el-button>
-          </div>
-        </el-dialog>
-
-        <!--增加定金-->
-        <el-dialog width="30%" title="增加定金" :visible.sync="outerVisibleAdd" :append-to-body="true">
-          <div class="addprice">
-            已付定金
-            <div class="yifudingjin">
-              <template> {{ this.totalDeposit }} 元 </template>
-            </div>
-          </div>
-          <div class="addpricejine">增加金额</div>
-          <div style="width: 50%" class="zengjia">
-            <el-input type="textarea" :rows="2" maxlength="30" placeholder="请输入本次增加定金金额" v-model="money">
-            </el-input>
-            <div class="yuan">元</div>
-          </div>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="outerVisibleAdd = false">取 消</el-button>
-            <el-button type="primary" @click="editPrice(1)">确 定</el-button>
-          </div>
-        </el-dialog>
-
-        <!--退回定金-->
-        <el-dialog width="30%" title="退回定金" :visible.sync="outerVisibleReturn" :append-to-body="true">
-          <div class="returnprice">
-            可退定金
-            <div class="ketuidingjin">
-              <template>
-                {{ this.totalDeposit - this.freezingDeposit }} 元
-              </template>
-            </div>
-          </div>
-          <div class="returnpricejine">退回金额</div>
-          <div style="width: 50%" class="tuihui">
-            <el-input type="textarea" :rows="2" maxlength="30" placeholder="请输入本次退回定金金额" v-model="money">
-            </el-input>
-            <div class="yuan">元</div>
-          </div>
-          <div slot="footer" class="dialog-footer">
-            <el-button @click="outerVisibleReturn = false">取 消</el-button>
-            <el-button type="primary" @click="editPrice(2)">确 定</el-button>
-          </div>
-        </el-dialog>
       </template>
     </BaseHeaderLayout>
-    <el-table class="wenzi" :data="customerList.records" style="width: 100%" height="calc(100% - 110px)">
+    <el-table class="wenzi" :data="leaveList.records" style="width: 100%" height="calc(100% - 110px)">
       <el-table-column prop="index" label="序号" width="80">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="customerName" label="客户名称">
-        <!-- <template scope="scope">
-            <span
-              v-if="
-                scope.row.customerName == '' || scope.row.customerName == null
-              "
-              >{{ scope.row.compName }}</span
-            >
-            <span
-              v-if="scope.row.compName == '' || scope.row.compName == null"
-              >{{ scope.row.customerName }}</span
-            >
-          </template> -->
-      </el-table-column>
-      <el-table-column prop="compAddress" label="地址"></el-table-column>
-      <el-table-column prop="customerPhone" label="电话"> </el-table-column>
-      <el-table-column width='170' prop="payTaxesCard" label="纳税人识别号">
-        <template scope="scope">
-          <span v-if="
-                scope.row.payTaxesCard == '' || scope.row.payTaxesCard == null
-              ">
-            — —
-          </span>
-          {{ scope.row.payTaxesCard }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="bankDeposit" label="开户行">
-        <template slot-scope="scope">
-          {{ scope.row.bankDeposit }} - {{ scope.row.bankDepositBranch }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="bankCard" label="银行卡号"> </el-table-column>
-      <el-table-column prop="totalDeposit" label="总定金(元)">
-      </el-table-column>
-      <el-table-column width='150' prop="freezingDeposit" label="冻结定金(元)">
-      </el-table-column>
-      <el-table-column width='150' class="table_td" prop="depositRatio" label="定金比例(元/吨)">
-        <template slot-scope="scope">
-          <div class="inputChenge">
-            <!-- readonly -->
-            <el-input v-model="scope.row.depositRatio" v-if="scope.row.identification == 'true'"></el-input>
-            <div v-if="scope.row.identification == 'false'" class="inputs">
-              {{ scope.row.depositRatio }}
-            </div>
-          </div>
-          <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/edit.png" @click="whether(scope.row)" v-if="scope.row.identification == 'false'"
-            alt="" />
-          <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
-            v-if="scope.row.identification == 'true'" @click="varietyClick(scope.row)"></i>
-          <!-- <div>—</div> -->
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="updateDate" label="更新时间"> </el-table-column>
-      <el-table-column prop="seller" label="操作" width="280">
-        <template slot-scope="scope">
-          <el-button type="primary" v-hasPermission="
-            `customerManagement.customer.customerInfo.View`
-          " @click="editClick(1, scope.row)">增加定金</el-button>
-          <el-button v-hasPermission="
-            `customerManagement.customer.customerInfo.View`
-          " type="primary" @click="editClick(2, scope.row)">退回定金</el-button>
-        </template>
-      </el-table-column>
+      <el-table-column prop="leaveNo" label="请假编号"></el-table-column>
+      <el-table-column prop="empName" label="请假人"></el-table-column>
+      <el-table-column prop="leaveType" label="请假类型"> </el-table-column>
+      <el-table-column width='170' prop="reasonForLeave" label="请假事由"></el-table-column>
+      <el-table-column prop="startDate" label="开始日期"></el-table-column>
+      <el-table-column prop="endDate" label="结束日期"> </el-table-column>
+      <el-table-column prop="leaveDuration" label="时长"></el-table-column>
+      <el-table-column width='150' prop="approveStatus" label="状态"></el-table-column>
     </el-table>
     <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
       :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
@@ -151,10 +41,8 @@
 </template>
 <script>
   import {
-    getList,
-    installDepositRatio,
-    editCustomerInfo,
-  } from '@/model/customer/index'
+    getLeavePc,
+  } from '@/model/personnelManagement/index'
   import Pagination from '@/components/Pagination'
   import WsUpload from '@/components/WsUpload'
 
@@ -204,7 +92,7 @@
         money: '',
         compId: localStorage.getItem('ws-pf_compId'),
         deptCircularPage: {},
-        customerList: [],
+        leaveList: [],
         deptBudgetList: {},
         historyList: [],
         pickerBeginDateBefore: {
@@ -212,18 +100,7 @@
             return time.getTime() > Date.now()
           },
         },
-        accessoryTFs: false,
-        customerInfo: {
-          id: '',
-          compId: '',
-          depositRatio: '',
-          flag: '',
-          money: '',
-          totalDeposit: 0,
-          freezingDeposit: 0,
-        },
-        totalDeposit: 0,
-        freezingDeposit: 0,
+        value2: '',
       }
     },
     activated() {
@@ -262,10 +139,6 @@
         }
         return fmt
       },
-
-      handleClose() {
-        this.accessoryTFs = false
-      },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`)
         this.pageSize = val
@@ -280,249 +153,32 @@
         this.searchType = state
         this.getList()
       },
-      //修改定金比例
-      varietyClick(row) {
-        if (
-          row.depositRatio < 0 ||
-          row.depositRatio > 100000 ||
-          (String(row.depositRatio).indexOf('.') != -1 &&
-            String(row.depositRatio).length -
-            (String(row.depositRatio).indexOf('.') + 1) >
-            2)
-        ) {
-          this.$message({
-            message: '定金比例输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (row.depositRatio) {
-          if (isNaN(row.depositRatio)) {
-            this.$message({
-              message: '定金比例非数字!',
-              type: 'warning',
-            })
-            return
-          }
-        }
-        if (!row.depositRatio) {
-          this.$message({
-            message: '定金比例不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-        this.$confirm(`确定要修改定金比例？`, {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-          })
-          .then(() => {
-            editCustomerInfo({
-                flag: 0,
-                depositRatio: row.depositRatio,
-                id: row.id,
-              })
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '修改成功',
-                })
-                this.getList()
-              })
-              .catch((response) => {})
-          })
-          .catch(() => {
-            return false
-          })
-      },
-      whether(row) {
-        row.identification = 'true'
-      },
       //列表查询
       getList() {
-        getList({
+        getLeavePc({
             compId: localStorage.getItem('ws-pf_compId'),
             currentPage: this.currentPage,
             pageSize: this.pageSize,
             searchKeyWord: this.searchKeyWord,
-            customerTypeFlag: this.customerTypeFlag,
+            theStartDate: this.startDate,
+            theEndDate: this.endDate,
           })
           .toPromise()
           .then((response) => {
-            for (var i = 0; i < response.records.length; i++) {
-              response.records[i].identification = 'false'
-            }
-            this.customerList = response
+            this.leaveList = response
             this.deptCircularPage.currentPage = response.current
             this.deptCircularPage.pageSize = response.size
             this.deptBudgetTotal = response.total
           })
       },
-      //设置默认定金比例
-      installRatio() {
-        this.outerVisibleDefaultEdit = true
-      },
-      editDefaultDepositRatio() {
-        if (
-          this.depositRatio < 1 ||
-          this.depositRatio > 100000 ||
-          (String(this.depositRatio).indexOf('.') != -1 &&
-            String(this.depositRatio).length -
-            (String(this.depositRatio).indexOf('.') + 1) >
-            2)
-        ) {
-          this.$message({
-            message: '默认定金比例输入错误',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.depositRatio) {
-          if (isNaN(this.depositRatio)) {
-            this.$message({
-              message: '默认定金比例非数字!',
-              type: 'warning',
-            })
-            return
-          }
-          if (!this.depositRatio) {
-            this.$message({
-              message: '默认定金比例不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-          installDepositRatio({
-              compId: localStorage.getItem('ws-pf_compId'),
-              depositRatio: this.depositRatio,
-            })
-            .toPromise()
-            .then((response) => {
-              this.outerVisibleDefaultEdit = false
-              this.getList()
-              this.$message.success('设置默认定金比例成功')
-            })
-        }
-      },
-      //编辑
-      editClick(index, row) {
-        this.id = row.id
-        this.depositRatio = row.depositRatio
-        this.totalDeposit = row.totalDeposit
-        this.freezingDeposit = row.freezingDeposit
-
-        //增加定金
-        if (index == 1) {
-          this.outerVisibleAdd = true
-          this.customerInfo.flag = 1
-        }
-        //退回定金
-        else {
-          this.outerVisibleReturn = true
-          this.customerInfo.flag = 2
-        }
-      },
-      editPrice(asdf) {
-        this.customerInfo.id = this.id
-        this.customerInfo.compId = this.compId
-        this.customerInfo.depositRatio = this.depositRatio
-        this.customerInfo.money = this.money
-        this.customerInfo.totalDeposit = this.totalDeposit
-        this.customerInfo.freezingDeposit = this.freezingDeposit
-
-        //增加定金
-        if (asdf == 1) {
-          if (
-            this.money < 0 ||
-            this.money > 100000000 ||
-            (String(this.money).indexOf('.') != -1 &&
-              String(this.money).length - (String(this.money).indexOf('.') + 1) >
-              2)
-          ) {
-            this.$message({
-              message: '增加金额输入错误',
-              type: 'warning',
-            })
-            return
-          }
-          if (this.money) {
-            if (isNaN(this.money)) {
-              this.$message({
-                message: '增加金额非数字!',
-                type: 'warning',
-              })
-              return
-            }
-          }
-          if (!this.money) {
-            this.$message({
-              message: '增加金额不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-        }
-        //退回定金
-        if (asdf == 2) {
-          if (
-            this.money < 0 ||
-            this.money > 100000000 ||
-            (String(this.money).indexOf('.') != -1 &&
-              String(this.money).length - (String(this.money).indexOf('.') + 1) >
-              2)
-          ) {
-            this.$message({
-              message: '退回金额输入错误',
-              type: 'warning',
-            })
-            return
-          }
-          if (this.money) {
-            if (isNaN(this.money)) {
-              this.$message({
-                message: '退回金额非数字!',
-                type: 'warning',
-              })
-              return
-            }
-          }
-          if (!this.money) {
-            this.$message({
-              message: '退回金额不能为空！',
-              type: 'warning',
-            })
-            return
-          }
-          if (this.money > this.totalDeposit - this.freezingDeposit) {
-            this.$message({
-              message: '退回金额不能大于可退金额！',
-              type: 'warning',
-            })
-            return
-          }
-        }
-        editCustomerInfo(this.customerInfo)
-          .toPromise()
-          .then((response) => {
-            this.outerVisibleAdd = false
-            this.outerVisibleReturn = false
-            this.outerVisibleEdit = false
-            this.getList()
-            this.money = ''
-
-            //增加定金
-            if (asdf == 1) {
-              this.$message.success('增加成功')
-            }
-            //退回定金
-            if (asdf == 2) {
-              this.$message.success('退回成功')
-            }
-          })
-      },
       find() {
+        if (this.value2) {
+          this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+          this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+        } else {
+          this.startDate = ''
+          this.endDate = ''
+        }
         this.currentPage = 1
         this.getList()
       },

src/views/profitable/oilcost.vue

@@ -179,8 +179,7 @@
       <!-- </div> -->
     </el-dialog>
     <el-dialog width='50%' :visible.sync="dialogVisible2" :title="title1">
-      <div  style='padding:20px;' v-for="(item,index) in recordList" :style="{'border-bottom':(index!=recordList.length-1?'1px solid #ccc':'none')}"
->
+      <div  style='padding:20px;' v-for="(item,index) in recordList" :style="{'border-bottom':(index!=recordList.length-1?'1px solid #ccc':'none')}">
         <div style='width:100%;justify-content: space-between;' class='flex'>
           <div style='width:33.333%;text-align:left;'>{{item.operateUser}}</div>
           <div style='width:33.333%;text-align:center;'>{{item.dealMsg!='请款'?item.approveResult==1?'通过':'驳回':item.dealMsg}}</div>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -85,7 +85,7 @@
                 <span v-if="scope.row.taskStatus == '待审核'" class="executory"></span>
                 <span v-if="scope.row.taskStatus == '执行中'" class="inExecution"></span>
                 <span v-if="scope.row.taskStatus == '已完成'" class="done"></span>
-                {{scope.row.approveStatus?scope.row.approveStatus:scope.row.taskStatus }}
+                {{ scope.row.taskStatus }}
               </span>
             </template>
             <img v-if="scope.row.taskStatus == '执行中'" width="17" height="18"
@@ -121,7 +121,9 @@
               <el-divider direction="vertical" v-if=" scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'"></el-divider>
             </span>
-
+            <span v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.delete`">
+              <el-divider direction="vertical" v-if="scope.row.show"></el-divider>
+            </span>
             <span class="corles" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
               " v-if="scope.row.show" @click="rectify(scope.row)">矫正</span>

src/views/warehouse/warehouseManagementAdd.vue

@@ -318,8 +318,8 @@
       },
       // 上传附件
       uploadSuccessHandle(e) {
-        this.deptBudgetList.addressUrl += e.url + ','
-        this.addressUrls.push(e.url)
+        this.deptBudgetList.addressUrl += e.data.url + ','
+        this.addressUrls.push(e.data.url)
       },
       onChange(files) {
         this.fileNum = files

src/views/warehousenew/warehouseManagementAdd.vue

@@ -77,23 +77,8 @@
     </ws-form>
     <ws-form ref="deptBudgetList" :model="deptBudgetList">
       <div class="small-title" v-show="radio == 1">上传附件</div>
-      <!-- <el-upload ref='upload' action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false" :on-success="
-          (res, file) => {
-            uploadSuccessHandle(res)
-          }
-        " class="avatar-uploader" accept=".jpg, .jpeg, .png, .gif">
-        <el-button v-show="radio == 1">上传附件</el-button>
-      </el-upload> -->
       <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
         @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
-      <!-- <div class="addressUrls" v-if="addressUrls != null">
-        <div class="addressUrls-item">
-          <div v-for="(item, index) in addressUrls" class="addressUrl" :key="index">
-            <div @click="close(index)" class="iconfont icon-guanbi"></div>
-            <img v-if="addressUrls != null" width="100" height="100" :src="item" alt="" />
-          </div>
-        </div>
-      </div> -->
       <div style="margin-bottom: 5px" class="small-title">仓库定位</div>
       <!-- <map-drag  @marker="marker" @selectedAddress="selectedAddress" @provinceChange='provinceChange' @pickedAddress='getInfo'></map-drag> -->
       <map-drag @marker="marker" ref="childMap" :isShowaddress='false' v-on:addressListen='getAddress' v-on:pickedAddress='searchAddress' ></map-drag>