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

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

@@ -142,7 +142,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="往来单位:" prop="unitId" >
-              <el-select v-model="form.unitId" filterable  placeholder="请选择往来单位"   >
+              <el-select v-model="form.unitId" filterable  placeholder="请选择往来单位" style="width:100%;">
                 <el-option
                   v-for="item in unitList"
                   :key="item.unitId"
@@ -157,7 +157,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="工程名称" prop="projectId">
-              <el-select v-model="form.projectId" filterable placeholder="请选择工程名称"  >
+              <el-select v-model="form.projectId" filterable placeholder="请选择工程名称" style="width:100%;" >
                 <el-option
                   v-for="item in projectList"
                   :key="item.projectId"
@@ -169,7 +169,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="协议类型" prop="protocol">
-              <el-select v-model="form.protocol" filterable placeholder="请选择协议类型"   >
+              <el-select v-model="form.protocol" filterable placeholder="请选择协议类型" style="width:100%;">
                 <el-option
                   v-for="item in protocolList"
                   :key="item.protocolId"
@@ -182,18 +182,6 @@
         </el-row>
 
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="协议类型" prop="protocol">
-              <el-select v-model="form.protocol" filterable placeholder="请选择协议类型"   >
-                <el-option
-                  v-for="item in protocolList"
-                  :key="item.protocolId"
-                  :label="item.protocolName"
-                  :value="item.protocolId"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="开始日期" prop="planStartTime">
               <el-date-picker
@@ -205,14 +193,14 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="租赁期限(天)" prop="leaseDay">
+              <el-input-number v-model="form.leaseDay"   placeholder="请输入租赁期限(天)" controls-position="right" :min="0" style="width:100%;"/>
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="租赁期限(天)" prop="leaseDay">
-              <el-input-number v-model="form.leaseDay"   placeholder="请输入租赁期限(天)" controls-position="right" :min="0" />
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="签订日期" prop="signTime">
               <el-date-picker
@@ -224,20 +212,25 @@
               ></el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        
-        <el-row>
           <el-col :span="12">
             <el-form-item label="授权人" prop="authPerson">
               <el-input 
               maxlength="50" v-model="form.authPerson" placeholder="请输入授权人" />
             </el-form-item>
           </el-col>
+        </el-row>
+        
+        <el-row>
           <el-col :span="12">
             <el-form-item label="联系方式" prop="phone">
               <el-input v-model="form.phone" placeholder="请输入联系方式" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="备注" prop="remark">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="200"/>
+            </el-form-item>
+          </el-col>
         </el-row>
        
         <el-row>
@@ -258,11 +251,6 @@
 
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" maxlength="200"/>
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer" style="text-align: center">

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

@@ -162,7 +162,7 @@ import {
   getDeviceTypeTree,
   getAgreementInfoById,
   submitLeaseApply,
-  getTaskDetail,
+  getLeaseListAll,
   editLeaseApply,
   getLeaseApplyListAll,
   getLeaseApplyAuditListAll

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

@@ -152,7 +152,7 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { auditLeaseByCompany, getTaskDetail,rejectLeaseByCompany } from '@/api/claimAndRefund/receive'
+import { auditLeaseByCompany, getLeaseListAll,rejectLeaseByCompany } from '@/api/claimAndRefund/receive'
 import {mapState} from 'vuex'
 export default {
   name: "ReceiveExamine",
@@ -352,7 +352,7 @@ export default {
     }, 
     /** 查询 */
     async getData(taskId) {
-      const res = await getTaskDetail({
+      const res = await getLeaseListAll({
         taskId
       })
       this.queryParams = {...this.queryParams,...res.rows[0]}

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

@@ -216,7 +216,7 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { getLeaseManageListAll, getUnitData, getProData, getTaskDetail } from '@/api/claimAndRefund/receive'
+import { getLeaseManageListAll, getUnitData, getProData, getLeaseListAll } from '@/api/claimAndRefund/receive'
 import { getInfo } from '@/api/login'
 import vueEasyPrint from 'vue-easy-print';
 export default {
@@ -417,7 +417,7 @@ export default {
     async openLld(row){
       this.open = true
 
-      const res = await getTaskDetail({taskId:row.taskId})
+      const res = await getLeaseListAll({taskId:row.taskId})
 
       this.leaseApplyDetails = res.rows[0].leaseApplyDetails
       this.leaseApplyData = res.rows[0]

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

@@ -122,7 +122,7 @@
             size="mini"
             type="primary" 
             icon="el-icon-edit"
-            v-if="scope.row.taskStatus==30"
+            v-if="scope.row.taskStatus==31"
             @click="handleUpdate(scope.row)"
           >编辑</el-button>
           <el-button
@@ -135,7 +135,7 @@
             size="mini"
             type="danger"
             icon="el-icon-delete"
-            v-if="scope.row.taskStatus==30"
+            v-if="scope.row.taskStatus==31"
             @click="handleDelete(scope.row)"
           >删除</el-button>
         </template>

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

@@ -318,7 +318,7 @@ export default {
           if (that.maForm.purchaseTime) {
             return (
               time.getTime() < Date.now() ||
-              time.getTime() < new Date(that.maForm.purchaseTime).getTime() - 8.64e7
+              time.getTime() < new Date(that.maForm.purchaseTime).getTime()
             );
           }
           return time.getTime() < Date.now(); //实现1效果