Merge remote-tracking branch 'origin/dev' into dev

sgzb-ui/src/views/claimAndRefund/receive/receiveApply.vue

@@ -162,7 +162,7 @@ import { getLeaseAuditListAll,getUnitData,getProData,deleteTask } from "@/api/cl
 
 
 export default {
-  name: "ReceiveApply",
+  // name: "ReceiveApply",
   dicts: ['sys_normal_disable'],
   data() {
     return {

sgzb-ui/src/views/claimAndRefund/receive/receiveExamine.vue

@@ -5,7 +5,7 @@
         <div>领料单号：{{ queryParams.code }}</div>
     </el-row>
     <el-row :gutter="24" class="mb8">
-      <el-col :span="18">
+      <el-col :span="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
           <el-form-item label="领料工程" prop="dictName">
             <el-input
@@ -43,6 +43,10 @@
             >领料管理</el-button>
           </el-col> 
         </el-row>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24" class="mb8">
+      <el-col :span="18">
         <el-table v-loading="loading" :data="queryParams.leaseApplyDetails" @selection-change="handleSelectionChange">
 <!--          <el-table-column type="selection" width="55" align="center" />-->
           <el-table-column label="序号" align="center" type="index" />
@@ -75,25 +79,9 @@
 <!--            </template>-->
 <!--          </el-table-column>-->
         </el-table>
-
-<!--        <pagination-->
-<!--          v-show="total>0"-->
-<!--          :total="total"-->
-<!--          :page.sync="queryParams.pageNum"-->
-<!--          :limit.sync="queryParams.pageSize"-->
-<!--          @pagination="getList"-->
-<!--        />-->
       </el-col>
 
       <el-col :span="6">
-<!--        <el-timeline size="large">-->
-<!--          <el-timeline-item-->
-<!--            v-for="(activity, index) in activities"-->
-<!--            :key="index"-->
-<!--            :timestamp="activity.timestamp">-->
-<!--            {{activity.content}}-->
-<!--          </el-timeline-item>-->
-<!--        </el-timeline>-->
         <el-timeline>
           <el-timeline-item  color="#0bbd87" icon="el-icon-check" placement="top">
             <el-card>

sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApply.vue

@@ -86,12 +86,20 @@
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
+      <el-table-column label="领料类型" align="center" prop="leaseType" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span v-if="scope.row.leaseType==0">工程租赁</span>
+          <span v-if="scope.row.leaseType==1">长期领用</span>
+        </template>
+      </el-table-column>
+      
       <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
       <el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" />
       <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
       <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" />
       <el-table-column label="联系电话" align="center" prop="leasePhone" :show-overflow-tooltip="true" />
       <el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" />
+      <el-table-column label="预计领料时间" align="center" prop="estimateLeaseTime" :show-overflow-tooltip="true" />
       <el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true" />
       <el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
       <el-table-column label="审批意见 " align="center" :show-overflow-tooltip="true">
@@ -162,7 +170,7 @@ import { getLeaseAuditListAll,getUnitData,getProData,deleteTask } from "@/api/cl
 
 
 export default {
-  name: "ReceiveApply",
+  // name: "ReceiveApply",
   dicts: ['sys_normal_disable'],
   data() {
     return {

sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveApplyAddByCq.vue

@@ -50,9 +50,9 @@
         <el-form-item label="预计领料时间" prop="estimateLeaseTime">
           <el-date-picker
               v-model="queryParams.estimateLeaseTime"
-              style="width: 180px"
+              style="width: 240px"
-              value-format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd HH:mm:ss"
-              type="date"
+              type="datetime"
               placeholder="预计领料时间"
           ></el-date-picker>
         </el-form-item>
@@ -456,6 +456,8 @@ export default {
       this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
       this.queryParams.agreementCode = data.agreementCode
       this.queryParams.agreementId = data.agreementId
+      this.queryParams.estimateLeaseTime = data.estimateLeaseTime
+      
       // this.queryParams.leaseType = data.leaseType
       this.$set(this.queryParams,'leaseType',data.leaseType)
       this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark
@@ -485,6 +487,7 @@ export default {
       this.queryParams.leaseApplyInfo.leasePerson = data.leaseApplyInfoList[0].leasePerson
       this.queryParams.agreementCode = data.agreementCode
       this.queryParams.agreementId = data.agreementId
+      this.queryParams.estimateLeaseTime = data.estimateLeaseTime
       // this.queryParams.leaseType = data.leaseType
       this.$set(this.queryParams,'leaseType',data.leaseType)
       this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfoList[0].remark

sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveExamineByCq.vue

@@ -5,9 +5,17 @@
         <div>领料单号：{{ queryParams.code }}</div>
     </el-row>
     <el-row :gutter="24" class="mb8">
-      <el-col :span="18">
+      <el-col :span="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-          <el-form-item label="领料工程" prop="dictName">
+          <el-form-item label="领料类型" prop="leaseTypeName">
+            <el-input
+              v-model="queryParams.leaseTypeName"
+              placeholder="请输入领料类型"
+              disabled
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="领料工程" prop="proName">
             <el-input
               v-model="queryParams.proName"
               placeholder="请输入领料工程"
@@ -15,7 +23,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="领料人" prop="dictName">
+          <el-form-item label="领料人" prop="leasePerson">
             <el-input
               v-model="queryParams.leaseApplyInfo.leasePerson"
               placeholder="请输入领料人"
@@ -23,7 +31,7 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
-          <el-form-item label="联系电话" prop="dictName">
+          <el-form-item label="联系电话" prop="phone">
             <el-input
               v-model="queryParams.leaseApplyInfo.phone"
               placeholder="请输入联系电话"
@@ -31,6 +39,14 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="预计领料时间" prop="estimateLeaseTime">
+            <el-input
+              v-model="queryParams.estimateLeaseTime"
+              placeholder="预计领料时间"
+              disabled
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
         </el-form>
         <el-row :gutter="10" class="mb8"> 
           <el-col :span="1.5">
@@ -43,6 +59,10 @@
             >领料管理</el-button>
           </el-col> 
         </el-row>
+      </el-col>
+    </el-row>
+    <el-row :gutter="24" class="mb8">
+      <el-col :span="18">
         <el-table v-loading="loading" :data="queryParams.leaseApplyDetails" @selection-change="handleSelectionChange">
 <!--          <el-table-column type="selection" width="55" align="center" />-->
           <el-table-column label="序号" align="center" type="index" />
@@ -75,25 +95,9 @@
 <!--            </template>-->
 <!--          </el-table-column>-->
         </el-table>
-
-<!--        <pagination-->
-<!--          v-show="total>0"-->
-<!--          :total="total"-->
-<!--          :page.sync="queryParams.pageNum"-->
-<!--          :limit.sync="queryParams.pageSize"-->
-<!--          @pagination="getList"-->
-<!--        />-->
       </el-col>
 
       <el-col :span="6">
-<!--        <el-timeline size="large">-->
-<!--          <el-timeline-item-->
-<!--            v-for="(activity, index) in activities"-->
-<!--            :key="index"-->
-<!--            :timestamp="activity.timestamp">-->
-<!--            {{activity.content}}-->
-<!--          </el-timeline-item>-->
-<!--        </el-timeline>-->
         <el-timeline>
           <el-timeline-item  color="#0bbd87" icon="el-icon-check" placement="top">
             <el-card>
@@ -323,9 +327,7 @@ export default {
     }, 
     /** 查询 */
     async getData(taskId) {
-      const res = await getLeaseListAllCq({
+      const res = await getLeaseListAllCq({taskId})
-        taskId
-      })
       this.queryParams = {...this.queryParams,...res.rows[0]}
       this.$set(this.queryParams,'leaseApplyInfo',this.queryParams.leaseApplyInfoList[0])
       this.queryParams.leaseApplyDetails.forEach(v => {
@@ -335,7 +337,15 @@ export default {
          this.$set(v,'createTime',this.queryParams.createTimes)
          this.$set(v,'updateTime',this.queryParams.updateTimes)
       })
-      console.log(this.queryParams.examineStatusId)
+      if(this.queryParams.leaseType=='0'){
+        this.$set(this.queryParams,'leaseTypeName','工程租赁')
+      }else if(this.queryParams.leaseType=='1'){
+        this.$set(this.queryParams,'leaseTypeName','长期租赁')
+      }else{
+        this.$set(this.queryParams,'leaseTypeName','')
+      }
+
+      // console.log(this.queryParams.examineStatusId)
       for (let i=0; i < this.flowPath.length; i++ ){
         if(this.flowPath[i].id < this.queryParams.examineStatusId){
           this.flowPath[i].color = '#0bbd87'
@@ -350,7 +360,7 @@ export default {
           break
         }
       }
-      console.log(this.flowPath)
+      // console.log(this.flowPath)
       if(this.queryParams.examineStatusId==98){
         this.flowPath[0].color = 'red'
         this.flowPath[0].icon = 'el-icon-close'

sgzb-ui/src/views/claimAndRefund/receiveByCq/receiveManage.vue

@@ -84,12 +84,19 @@
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
+      <el-table-column label="领料类型" align="center" prop="leaseType" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <span v-if="scope.row.leaseType==0">工程租赁</span>
+          <span v-if="scope.row.leaseType==1">长期领用</span>
+        </template>
+      </el-table-column>
       <el-table-column label="领料单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
       <el-table-column label="领料工程" align="center" prop="proName" :show-overflow-tooltip="true" />
       <el-table-column label="协议号" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
       <el-table-column label="领料人" align="center" prop="leasePerson" :show-overflow-tooltip="true" />
       <el-table-column label="联系电话" align="center" prop="leasePhone" :show-overflow-tooltip="true" />
       <el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" />
+      <el-table-column label="预计领料时间" align="center" prop="estimateLeaseTime" :show-overflow-tooltip="true" />
       <el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true" />
       <el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
 <!--      <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->

sgzb-ui/src/views/claimAndRefund/return/returnApply.vue

@@ -346,7 +346,7 @@ import dialogForm from "./dialogForm.vue";
 // 10:42开始日期startTime,结束日期endTime     机具类型typeId
 // http://localhost/claimAndRefund/return/returnApply
 export default {
-  name: "ReturnApply",
+  name: "",
   dicts: ['sys_normal_disable'],
   components: { dialogForm, },
   data() {

sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue

@@ -346,7 +346,7 @@ import dialogForm from "./dialogForm.vue";
 // 10:42开始日期startTime,结束日期endTime     机具类型typeId
 // http://localhost/claimAndRefund/return/returnApply
 export default {
-  name: "ReturnApply",
+  name: "",
   dicts: ['sys_normal_disable'],
   components: { dialogForm, },
   data() {

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesList.vue

@@ -138,7 +138,7 @@
               size="mini"
               type="success"
               icon="el-icon-edit"
-              v-if="scope.row.purchasingStatus!='已入库'&&scope.row.purchasingStatus!='已验收合格'&&scope.row.purchasingStatus!='待审核'"
+              v-if="scope.row.purchasingStatus!='已入库'&&scope.row.purchasingStatus!='已验收合格'&&scope.row.purchasingStatus!='待审核'&&scope.row.purchasingStatus!='驳回'"
               @click="handleAccept(scope.row)"
           >验收</el-button>
           <el-button

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue

@@ -48,7 +48,7 @@
           <span v-if="scope.row.taskStatus=='26'">已验收合格</span>
           <span v-if="scope.row.taskStatus=='28'">已入库</span>
           <span v-if="scope.row.taskStatus=='105'">待审核</span>
-          <span v-if="scope.row.taskStatus=='106'">已驳回</span>
+          <span v-if="scope.row.taskStatus=='107'">已驳回</span>
         </template>
       </el-table-column>