瀏覽代碼

【供应链系统---”工程登录编号“显示名称麻烦统一修改成”工程信息单号“(信息单、商用订单、工程发货单、销售单执行明细列表、发货单汇总表等)】
https://www.tapd.cn/69216019/prong/stories/view/1169216019001004320

zhouhao 2 年之前
父節點
當前提交
9e9ef56b24
共有 79 個文件被更改,包括 154 次插入92 次删除
  1. 1 1
      src/utils/panel.js
  2. 2 0
      src/views/basic_data/stock/Issue_list.vue
  3. 1 0
      src/views/basic_data/stock/material_list.vue
  4. 4 0
      src/views/basic_data/stock/stock_fee_list.vue
  5. 1 0
      src/views/basic_data/stock/warehousing_list.vue
  6. 1 1
      src/views/deposit_commerce/components/deposit-apply-deduction.vue
  7. 1 1
      src/views/deposit_commerce/components/deposit-apply-surrender.vue
  8. 1 1
      src/views/deposit_commerce/components/deposit_list-detail.vue
  9. 1 1
      src/views/deposit_commerce/components/refund_list-detail.vue
  10. 2 2
      src/views/deposit_commerce/deposit_list.vue
  11. 2 2
      src/views/deposit_commerce/refund_list.vue
  12. 1 1
      src/views/deposit_home/components/deposit-apply-deduction.vue
  13. 1 1
      src/views/deposit_home/components/deposit-apply-surrender.vue
  14. 1 1
      src/views/deposit_home/components/deposit_list-detail.vue
  15. 1 1
      src/views/deposit_home/components/refund_list-detail.vue
  16. 2 2
      src/views/deposit_home/deposit_list.vue
  17. 2 2
      src/views/deposit_home/refund_list.vue
  18. 1 1
      src/views/engin_deposit/components/deposit-apply-deduction.vue
  19. 1 1
      src/views/engin_deposit/components/deposit-apply-surrender.vue
  20. 1 1
      src/views/engin_deposit/components/deposit_list-detail.vue
  21. 1 1
      src/views/engin_deposit/components/refund_list-detail.vue
  22. 2 2
      src/views/engin_deposit/deposit_list.vue
  23. 2 2
      src/views/engin_deposit/refund_list.vue
  24. 1 0
      src/views/finance/components/balance_sum-detail.vue
  25. 1 0
      src/views/notice/index.vue
  26. 2 0
      src/views/setting/components/log-examine.vue
  27. 1 0
      src/views/setting/components/log-login.vue
  28. 1 0
      src/views/setting/components/log-operation.vue
  29. 1 0
      src/views/supply/adjust/adjust_list.vue
  30. 2 1
      src/views/supply/allot/allot_list.vue
  31. 4 3
      src/views/supply/apply/apply_list.vue
  32. 1 1
      src/views/supply/apply/components/engin_detail.vue
  33. 1 1
      src/views/supply/apply/components/engin_examine.vue
  34. 6 5
      src/views/supply/apply/components/engin_form.vue
  35. 1 1
      src/views/supply/apply/components/engin_return.vue
  36. 5 5
      src/views/supply/apply/components/engin_return_form.vue
  37. 17 12
      src/views/supply/apply/engin_list.vue
  38. 1 0
      src/views/supply/apply/new_apply.vue
  39. 4 3
      src/views/supply/apply/new_engin.vue
  40. 2 1
      src/views/supply/deliver/commerce_list.vue
  41. 1 0
      src/views/supply/deliver/deliver_list.vue
  42. 2 1
      src/views/supply/deliver/home_list.vue
  43. 3 0
      src/views/supply/deliver/sum_list.vue
  44. 1 0
      src/views/supply/direct/direct_list.vue
  45. 1 1
      src/views/supply/displace/components/displace_detail.vue
  46. 1 1
      src/views/supply/displace/components/displace_examine.vue
  47. 2 2
      src/views/supply/displace/components/displace_form.vue
  48. 1 1
      src/views/supply/displace/components/displace_return.vue
  49. 1 0
      src/views/supply/displace/displace_list copy.vue
  50. 2 1
      src/views/supply/engin/commerce_list.vue
  51. 1 1
      src/views/supply/engin/components/commerce_detail.vue
  52. 1 1
      src/views/supply/engin/components/commerce_examine.vue
  53. 2 2
      src/views/supply/engin/components/commerce_form.vue
  54. 1 1
      src/views/supply/engin/components/commerce_return.vue
  55. 1 1
      src/views/supply/engin/components/engin_detail.vue
  56. 1 1
      src/views/supply/engin/components/engin_examine.vue
  57. 1 1
      src/views/supply/engin/components/engin_form.vue
  58. 1 1
      src/views/supply/engin/components/home_detail.vue
  59. 1 1
      src/views/supply/engin/components/home_examine.vue
  60. 4 4
      src/views/supply/engin/components/home_form.vue
  61. 1 1
      src/views/supply/engin/components/home_return.vue
  62. 6 5
      src/views/supply/engin/engin_list.vue
  63. 5 3
      src/views/supply/engin/home_list.vue
  64. 1 0
      src/views/supply/implement/commercial_implement_list.vue
  65. 4 2
      src/views/supply/implement/implement_list.vue
  66. 4 2
      src/views/supply/implement/implement_total_list.vue
  67. 4 0
      src/views/supply/implement/nsales_list.vue
  68. 2 0
      src/views/supply/pickup/pickup_list.vue
  69. 1 0
      src/views/supply/pickup/statistics.vue
  70. 2 0
      src/views/supply/pickup/sum_list.vue
  71. 1 0
      src/views/supply/policy/components/policy_list.vue
  72. 1 0
      src/views/supply/policy/policy_list.vue
  73. 1 0
      src/views/supply/purchase/enter_list.vue
  74. 1 0
      src/views/supply/purchase/purchase_list.vue
  75. 1 0
      src/views/supply/reserve/reserve_list.vue
  76. 1 0
      src/views/supply/retail/retail_list.vue
  77. 1 0
      src/views/supply/return/online_list.vue
  78. 1 0
      src/views/supply/return/return_list.vue
  79. 3 0
      src/views/supply/sales/sales_list.vue

+ 1 - 1
src/utils/panel.js

@@ -146,7 +146,7 @@ export default {
             lineHeight: 13,
             width: 328,
             fontSize: 12.5,
-            title: '工程登录编号',
+            title: '工程信息单号',
             fontFamily: '黑体,宋体,微软雅黑',
             field: 'refEnginRecordNo',
             color: '#000',

+ 2 - 0
src/views/basic_data/stock/Issue_list.vue

@@ -31,6 +31,8 @@
                   <el-date-picker
                     v-model="screenForm.date"
                     type="datetimerange"
+                    :default-time="['00:00:00','23:59:59']"
+
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/basic_data/stock/material_list.vue

@@ -31,6 +31,7 @@
                   <el-date-picker
                     v-model="screenForm.date"
                     type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"

+ 4 - 0
src/views/basic_data/stock/stock_fee_list.vue

@@ -38,6 +38,7 @@
                   <el-date-picker
                     v-model="screenForm.orderDate"
                     type="datetimerange"
+                    :default-time="['00:00:00','23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -52,6 +53,7 @@
                   <el-date-picker
                     v-model="screenForm.invoiceDate"
                     type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -106,6 +108,7 @@
                   <el-date-picker
                     v-model="screenForm.approvalDate"
                     type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -133,6 +136,7 @@
                   <el-date-picker
                     v-model="screenForm.saleDate"
                     type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/basic_data/stock/warehousing_list.vue

@@ -31,6 +31,7 @@
                   <el-date-picker
                     v-model="screenForm.date"
                     type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 1
src/views/deposit_commerce/components/deposit-apply-deduction.vue

@@ -9,7 +9,7 @@
     <div class="diy-table-1">
       <el-row :gutter="0">
         <el-col :xs="12" :sm="8" :lg="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程信息单号</div>
           <div class="value">2022123233435342</div>
         </el-col>
         <el-col :xs="12" :sm="8" :lg="8" class="item">

+ 1 - 1
src/views/deposit_commerce/components/deposit-apply-surrender.vue

@@ -10,7 +10,7 @@
       <el-form ref="form" :model="details">
         <el-row :gutter="0">
           <el-col :xs="12" :sm="8" :lg="8" class="item">
-            <div class="label">工程登录编号</div>
+            <div class="label">工程信息单号</div>
             <div class="value">{{ details.refEnginRecordNo }}</div>
           </el-col>
           <el-col :xs="12" :sm="8" :lg="8" class="item">

+ 1 - 1
src/views/deposit_commerce/components/deposit_list-detail.vue

@@ -18,7 +18,7 @@
         <el-form ref="form" :model="details">
           <el-row :gutter="0">
             <el-col :xs="12" :sm="8" :lg="8" class="item">
-              <div class="label">工程登录编号</div>
+              <div class="label">工程信息单号</div>
               <div class="value">{{ details.refEnginRecordNo }}</div>
             </el-col>
             <el-col :xs="12" :sm="8" :lg="8" class="item">

+ 1 - 1
src/views/deposit_commerce/components/refund_list-detail.vue

@@ -11,7 +11,7 @@
       <el-row :gutter="0">
         <el-col :xs="12" :sm="24" :lg="8" class="item">
           <div class="label">
-            {{ detailList.enginOrderType == 'HOME' ? '工程登录编号' : '工程信息编号' }}
+            {{ detailList.enginOrderType == 'HOME' ? '工程信息单号' : '工程信息编号' }}
           </div>
           <div class="value">
             <CopyButton :copy-text="detailList.refEnginRecordNo" /> {{ detailList.refEnginRecordNo }}

+ 2 - 2
src/views/deposit_commerce/deposit_list.vue

@@ -18,7 +18,7 @@
             <el-form ref="screenForm" :model="screenForm" label-width="140px" size="mini" label-position="left">
               <el-row :gutter="20">
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="工程登录编号" prop="refEnginRecordNo">
+                  <el-form-item label="工程信息单号" prop="refEnginRecordNo">
                     <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
                   </el-form-item>
                 </el-col>
@@ -287,7 +287,7 @@
             <el-table-column align="left" type="selection" width="55" />
             <el-table-column
               align="left"
-              label="工程登录编号"
+              label="工程信息单号"
               prop="refEnginRecordNo"
               min-width="160"
               show-overflow-tooltip

+ 2 - 2
src/views/deposit_commerce/refund_list.vue

@@ -21,7 +21,7 @@
             <el-form ref="screenForm" :model="screenForm" label-width="120px" size="mini" label-position="left">
               <el-row :gutter="20">
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="工程登录编号" prop="refEnginRecordNo">
+                  <el-form-item label="工程信息单号" prop="refEnginRecordNo">
                     <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
                   </el-form-item>
                 </el-col>
@@ -320,7 +320,7 @@
             <el-table-column align="right" label="金额" prop="hasSendQty" min-width="100" show-overflow-tooltip />
             <el-table-column
               align="left"
-              label="工程登录编号"
+              label="工程信息单号"
               prop="refEnginRecordNo"
               min-width="160"
               show-overflow-tooltip

+ 1 - 1
src/views/deposit_home/components/deposit-apply-deduction.vue

@@ -9,7 +9,7 @@
     <div class="diy-table-1">
       <el-row :gutter="0">
         <el-col :xs="12" :sm="8" :lg="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程信息单号</div>
           <div class="value">2022123233435342</div>
         </el-col>
         <el-col :xs="12" :sm="8" :lg="8" class="item">

+ 1 - 1
src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -10,7 +10,7 @@
       <el-form ref="form" :model="details">
         <el-row :gutter="0">
           <el-col :xs="12" :sm="8" :lg="8" class="item">
-            <div class="label">工程登录编号</div>
+            <div class="label">工程信息单号</div>
             <div class="value">{{ details.refEnginRecordNo }}</div>
           </el-col>
           <el-col :xs="12" :sm="8" :lg="8" class="item">

+ 1 - 1
src/views/deposit_home/components/deposit_list-detail.vue

@@ -18,7 +18,7 @@
         <el-form ref="form" :model="details">
           <el-row :gutter="0">
             <el-col :xs="12" :sm="8" :lg="8" class="item">
-              <div class="label">工程登录编号</div>
+              <div class="label">工程信息单号</div>
               <div class="value">{{ details.refEnginRecordNo }}</div>
             </el-col>
             <el-col :xs="12" :sm="8" :lg="8" class="item">

+ 1 - 1
src/views/deposit_home/components/refund_list-detail.vue

@@ -11,7 +11,7 @@
       <el-row :gutter="0">
         <el-col :xs="12" :sm="24" :lg="8" class="item">
           <div class="label">
-            {{ detailList.enginOrderType == 'HOME' ? '工程登录编号' : '工程信息编号' }}
+            {{ detailList.enginOrderType == 'HOME' ? '工程信息单号' : '工程信息编号' }}
           </div>
           <div class="value">
             <CopyButton :copy-text="detailList.refEnginRecordNo" />

+ 2 - 2
src/views/deposit_home/deposit_list.vue

@@ -18,7 +18,7 @@
             <el-form ref="screenForm" :model="screenForm" label-width="140px" size="mini" label-position="left">
               <el-row :gutter="20">
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="工程登录编号" prop="refEnginRecordNo">
+                  <el-form-item label="工程信息单号" prop="refEnginRecordNo">
                     <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
                   </el-form-item>
                 </el-col>
@@ -438,7 +438,7 @@
             <el-table-column align="left" type="selection" width="55" />
             <el-table-column
               align="left"
-              label="工程登录编号"
+              label="工程信息单号"
               prop="refEnginRecordNo"
               min-width="160"
               show-overflow-tooltip

+ 2 - 2
src/views/deposit_home/refund_list.vue

@@ -21,7 +21,7 @@
             <el-form ref="screenForm" :model="screenForm" label-width="140px" size="mini" label-position="left">
               <el-row :gutter="20">
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="工程登录编号" prop="refEnginRecordNo">
+                  <el-form-item label="工程信息单号" prop="refEnginRecordNo">
                     <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
                   </el-form-item>
                 </el-col>
@@ -338,7 +338,7 @@
             <el-table-column align="right" label="金额" prop="hasSendQty" min-width="100" show-overflow-tooltip />
             <el-table-column
               align="left"
-              label="工程登录编号"
+              label="工程信息单号"
               prop="refEnginRecordNo"
               min-width="160"
               show-overflow-tooltip

+ 1 - 1
src/views/engin_deposit/components/deposit-apply-deduction.vue

@@ -9,7 +9,7 @@
     <div class="diy-table-1">
       <el-row :gutter="0">
         <el-col :xs="12" :sm="8" :lg="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程信息单号</div>
           <div class="value">2022123233435342</div>
         </el-col>
         <el-col :xs="12" :sm="8" :lg="8" class="item">

+ 1 - 1
src/views/engin_deposit/components/deposit-apply-surrender.vue

@@ -10,7 +10,7 @@
       <el-form ref="form" :model="details">
         <el-row :gutter="0">
           <el-col :xs="12" :sm="8" :lg="8" class="item">
-            <div class="label">工程登录编号</div>
+            <div class="label">工程信息单号</div>
             <div class="value">{{ details.refEnginRecordNo }}</div>
           </el-col>
           <el-col :xs="12" :sm="8" :lg="8" class="item">

+ 1 - 1
src/views/engin_deposit/components/deposit_list-detail.vue

@@ -17,7 +17,7 @@
         <el-form ref="form" :model="details">
           <el-row :gutter="0">
             <el-col :xs="12" :sm="8" :lg="8" class="item">
-              <div class="label">工程登录编号</div>
+              <div class="label">工程信息单号</div>
               <div class="value">{{ details.refEnginRecordNo }}</div>
             </el-col>
             <el-col :xs="12" :sm="8" :lg="8" class="item">

+ 1 - 1
src/views/engin_deposit/components/refund_list-detail.vue

@@ -11,7 +11,7 @@
       <el-row :gutter="0">
         <el-col :xs="12" :sm="24" :lg="8" class="item">
           <div class="label">
-            {{ detailList.enginOrderType == 'HOME' ? '工程登录编号' : '工程信息编号' }}
+            {{ detailList.enginOrderType == 'HOME' ? '工程信息单号' : '工程信息编号' }}
           </div>
           <div class="value">{{ detailList.refEnginRecordNo }}</div>
         </el-col>

+ 2 - 2
src/views/engin_deposit/deposit_list.vue

@@ -11,7 +11,7 @@
         <el-form ref="screenForm" :model="screenForm" label-width="120px" size="mini" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程登录编号" prop="refEnginRecordNo">
+              <el-form-item label="工程信息单号" prop="refEnginRecordNo">
                 <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
               </el-form-item>
             </el-col>
@@ -95,7 +95,7 @@
             <el-table-column align="left" type="selection" width="55" />
             <el-table-column
               align="left"
-              label="工程登录编号"
+              label="工程信息单号"
               prop="refEnginRecordNo"
               min-width="160"
               show-overflow-tooltip

+ 2 - 2
src/views/engin_deposit/refund_list.vue

@@ -14,7 +14,7 @@
         <el-form ref="searchForm" :model="searchForm" label-width="160px" size="mini" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程登录编号" prop="refEnginRecordNo">
+              <el-form-item label="工程信息单号" prop="refEnginRecordNo">
                 <el-input v-model="searchForm.refEnginRecordNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
@@ -130,7 +130,7 @@
             </el-table-column>
             <el-table-column
               align="left"
-              label="工程登录编号"
+              label="工程信息单号"
               prop="refEnginRecordNo"
               min-width="160"
               show-overflow-tooltip

+ 1 - 0
src/views/finance/components/balance_sum-detail.vue

@@ -36,6 +36,7 @@
             <el-form-item label="日期时间" prop="">
               <el-date-picker
                 type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"

+ 1 - 0
src/views/notice/index.vue

@@ -30,6 +30,7 @@
                   <el-date-picker
                     v-model="screenForm.date"
                     type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"

+ 2 - 0
src/views/setting/components/log-examine.vue

@@ -25,6 +25,7 @@
                   <el-date-picker
                     v-model="screenForm.examineDate"
                     type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -39,6 +40,7 @@
                   <el-date-picker
                     v-model="screenForm.submitDate"
                     type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/setting/components/log-login.vue

@@ -25,6 +25,7 @@
                   <el-date-picker
                     v-model="screenForm.date"
                     type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/setting/components/log-operation.vue

@@ -30,6 +30,7 @@
                   <el-date-picker
                     v-model="screenForm.date"
                     type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/supply/adjust/adjust_list.vue

@@ -38,6 +38,7 @@
                 <el-date-picker
                   v-model="screenForm.date"
                   type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                   range-separator="至"
                   style="width: 100%"
                   value-format="yyyy-MM-dd HH:mm:ss"

+ 2 - 1
src/views/supply/allot/allot_list.vue

@@ -26,9 +26,10 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
-                      value-format="yyyy-MM-dd HH:mm:ss"
+
                       start-placeholder="开始日期"
                       end-placeholder="结束日期"
                     >

+ 4 - 3
src/views/supply/apply/apply_list.vue

@@ -47,6 +47,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+                      :default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -557,7 +558,7 @@ export default {
         categoryId: '',
         approvalName: '',
         createBy: '',
-        automaticStatus:''
+        automaticStatus: ''
       },
       statusList: [
         { label: '已保存', value: 'SAVE' },
@@ -609,7 +610,7 @@ export default {
         mainOrderId: this.screenForm.mainOrderId,
         categoryId: this.screenForm.categoryId,
         approvalName: this.screenForm.approvalName,
-        automaticStatus:this.screenForm.automaticStatus
+        automaticStatus: this.screenForm.automaticStatus
       }
     }
   },
@@ -674,7 +675,7 @@ export default {
         correspondName: this.screenForm.warehouse,
         customerNumber: this.screenForm.jxsNum,
         createBy: this.screenForm.createBy,
-        automaticStatus:this.screenForm.automaticStatus,
+        automaticStatus: this.screenForm.automaticStatus,
 
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,

+ 1 - 1
src/views/supply/apply/components/engin_detail.vue

@@ -30,7 +30,7 @@
             <div class="value">{{ detailData.customerName }}</div>
           </el-col>
           <el-col :span="8" class="item">
-            <div class="label">工程登录编号</div>
+            <div class="label">工程信息单号</div>
             <div class="value">{{ detailData.refEnginRecordNo }}</div>
           </el-col>
           <el-col :span="8" class="item">

+ 1 - 1
src/views/supply/apply/components/engin_examine.vue

@@ -29,7 +29,7 @@
           <div class="value">{{ detailData.customerName }}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程信息单号</div>
           <div class="value">{{ detailData.refEnginRecordNo }}</div>
         </el-col>
         <el-col :span="8" class="item">

+ 6 - 5
src/views/supply/apply/components/engin_form.vue

@@ -52,9 +52,9 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程登录编号" prop="loginNum">
+          <el-form-item label="工程信息单号" prop="loginNum">
             <div style="display: flex">
-              <el-input v-model="mainForm.loginNum" :disabled="isDealer" placeholder="请输入工程登录编号"></el-input>
+              <el-input v-model="mainForm.loginNum" :disabled="isDealer" placeholder="请输入工程信息单号"></el-input>
               <el-button style="margin-left: 10px" @click="openDialog">引用</el-button>
             </div>
           </el-form-item>
@@ -273,8 +273,8 @@
       <el-form ref="screenForm" :model="screenForm" size="small" label-position="left" label-width="100px">
         <el-row :gutter="20">
           <el-col :xs="12" :sm="12" :lg="6">
-            <el-form-item prop="loginNum" label="工程登录编号">
-              <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
+            <el-form-item prop="loginNum" label="工程信息单号">
+              <el-input v-model="screenForm.loginNum" placeholder="请输入工程信息单号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
@@ -297,6 +297,7 @@
               <el-date-picker
                 v-model="screenForm.date"
                 type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                 range-separator="至"
                 style="width: 100%; height: 33px"
                 value-format="yyyy-MM-dd HH:mm:ss"
@@ -376,7 +377,7 @@
           </el-table-column>
           <el-table-column
             align="center"
-            label="工程登录编号"
+            label="工程信息单号"
             prop="refEnginRecordNo"
             min-width="200"
             show-overflow-tooltip

+ 1 - 1
src/views/supply/apply/components/engin_return.vue

@@ -21,7 +21,7 @@
           <div class="value">{{ detailData.srcStockId }}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程信息单号</div>
           <div class="value">{{ detailData.destStockId }}</div>
         </el-col>
         <el-col :span="8" class="item">

+ 5 - 5
src/views/supply/apply/components/engin_return_form.vue

@@ -52,9 +52,9 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程登录编号" prop="loginNum">
+          <el-form-item label="工程信息单号" prop="loginNum">
             <div style="display: flex">
-              <el-input v-model="mainForm.loginNum" placeholder="请输入工程登录编号"></el-input>
+              <el-input v-model="mainForm.loginNum" placeholder="请输入工程信息单号"></el-input>
               <el-button style="margin-left: 10px" @click="openDialog">引用</el-button>
             </div>
           </el-form-item>
@@ -308,8 +308,8 @@
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
-            <el-form-item prop="loginNum" label="工程登录编号">
-              <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
+            <el-form-item prop="loginNum" label="工程信息单号">
+              <el-input v-model="screenForm.loginNum" placeholder="请输入工程信息单号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
@@ -375,7 +375,7 @@
           </el-table-column>
           <el-table-column
             align="left"
-            label="工程登录编号"
+            label="工程信息单号"
             prop="refEnginRecordNo"
             min-width="140"
             show-overflow-tooltip

+ 17 - 12
src/views/supply/apply/engin_list.vue

@@ -3,13 +3,14 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm && !isShowReturnForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse   :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #left_btn>
             <el-radio-group size="mini" v-model="screenForm.status" @change="getList()">
               <el-radio-button label="">全部</el-radio-button>
               <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
                   item.label
-                }}</el-radio-button>
+                }}
+              </el-radio-button>
             </el-radio-group>
           </template>
           <template #right_btn>
@@ -46,6 +47,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+                      :default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -83,8 +85,8 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="工程登录编号" prop="refEnginRecordNo">
-                    <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入工程登录编号" />
+                  <el-form-item label="工程信息单号" prop="refEnginRecordNo">
+                    <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入工程信息单号" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
@@ -180,7 +182,8 @@
               type="primary"
               icon="el-icon-plus"
               @click="toForm()"
-            >发货申请</el-button
+            >发货申请
+            </el-button
             >
             <el-button
               v-if="$checkBtnRole('refund', $route.meta.roles)"
@@ -188,7 +191,8 @@
               type="primary"
               icon="el-icon-plus"
               @click="toReturnForm()"
-            >退货申请</el-button
+            >退货申请
+            </el-button
             >
             <el-button
               v-if="$checkBtnRole('examine', $route.meta.roles)"
@@ -197,7 +201,8 @@
               icon="el-icon-finished"
               :disabled="multipleSelection.length < 1"
               @click="batchExamine"
-            >批量审批</el-button
+            >批量审批
+            </el-button
             >
           </div>
           <div class="fr">
@@ -254,7 +259,7 @@
             </el-table-column>
             <el-table-column
               align="left"
-              label="工程登录编号"
+              label="工程信息单号"
               prop="refEnginRecordNo"
               min-width="200"
               show-overflow-tooltip
@@ -488,7 +493,7 @@
                 >
                   审单
                 </el-button>
-                <el-button type="text" @click="toDetail(scope.row)"> 详情 </el-button>
+                <el-button type="text" @click="toDetail(scope.row)"> 详情</el-button>
                 <!--             !scope.row.automaticStatus &&  -->
                 <el-popconfirm
                   v-if="!scope.row.automaticStatus && scope.row.examineStatus !== 'OK'"
@@ -628,7 +633,7 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
         examineStatus: this.screenForm.status,
         serviceId: this.screenForm.salesMan,
-        automaticStatus:this.screenForm.automaticStatus,
+        automaticStatus: this.screenForm.automaticStatus,
         k3ServiceId: this.screenForm.k3ServiceId,
         type: this.screenForm.orderType,
         mainOrderId: this.screenForm.mainOrderId,
@@ -701,7 +706,7 @@ export default {
         customerNumber: this.screenForm.jxsNum,
         customerName: this.screenForm.jxsName,
         productName: this.screenForm.chName,
-        automaticStatus:this.screenForm.automaticStatus,
+        automaticStatus: this.screenForm.automaticStatus,
         specification: this.screenForm.model,
         startTime: this.screenForm.date ? this.screenForm.date[0] : '',
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
@@ -865,7 +870,7 @@ export default {
      * @param {String} index - 索引值
      * @return Boolean
      */
-    selectable: function (row, index) {
+    selectable: function(row, index) {
       if (row.automaticStatus) {
         return false
       }

+ 1 - 0
src/views/supply/apply/new_apply.vue

@@ -40,6 +40,7 @@
                 <el-date-picker
                   v-model="screenForm.date"
                   type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                   range-separator="至"
                   style="width: 100%"
                   value-format="yyyy-MM-dd HH:mm:ss"

+ 4 - 3
src/views/supply/apply/new_engin.vue

@@ -40,6 +40,7 @@
                 <el-date-picker
                   v-model="screenForm.date"
                   type="datetimerange"
+                  :default-time="['00:00:00','23:59:59']"
                   range-separator="至"
                   style="width: 100%"
                   value-format="yyyy-MM-dd HH:mm:ss"
@@ -72,8 +73,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="工程登录编号" prop="refEnginRecordNo">
-                <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入工程登录编号" />
+              <el-form-item label="工程信息单号" prop="refEnginRecordNo">
+                <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入工程信息单号" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
@@ -233,7 +234,7 @@
             </el-table-column>
             <el-table-column
               align="left"
-              label="工程登录编号"
+              label="工程信息单号"
               prop="refEnginRecordNo"
               min-width="200"
               show-overflow-tooltip

+ 2 - 1
src/views/supply/deliver/commerce_list.vue

@@ -55,6 +55,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       value-format="yyyy-MM-dd HH:mm:ss"
                       start-placeholder="开始日期"
@@ -176,7 +177,7 @@
             </el-table-column>
             <el-table-column
               align="left"
-              label="工程登录编号"
+              label="工程信息单号"
               prop="refEnginRecordNo"
               min-width="200"
               show-overflow-tooltip

+ 1 - 0
src/views/supply/deliver/deliver_list.vue

@@ -58,6 +58,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"

+ 2 - 1
src/views/supply/deliver/home_list.vue

@@ -50,6 +50,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       value-format="yyyy-MM-dd HH:mm:ss"
                       start-placeholder="开始日期"
@@ -147,7 +148,7 @@
             </el-table-column>
             <el-table-column
               align="left"
-              label="工程登录编号"
+              label="工程信息单号"
               prop="refEnginRecordNo"
               min-width="150"
               show-overflow-tooltip

+ 3 - 0
src/views/supply/deliver/sum_list.vue

@@ -36,6 +36,7 @@
                     <el-date-picker
                       v-model="screenForm.createDate"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -49,6 +50,7 @@
                     <el-date-picker
                       v-model="screenForm.deliverDate"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -145,6 +147,7 @@
                     <el-date-picker
                       v-model="screenForm.approvaTime"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/supply/direct/direct_list.vue

@@ -46,6 +46,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 1
src/views/supply/displace/components/displace_detail.vue

@@ -41,7 +41,7 @@
             <div class="value">{{ detailData.policyRemark }}</div>
           </el-col>
           <el-col :span="8" class="item">
-            <div class="label">工程登录编号</div>
+            <div class="label">工程信息单号</div>
             <div class="value">{{ detailData.enginRecordNo }}</div>
           </el-col>
           <el-col :span="8" class="item">

+ 1 - 1
src/views/supply/displace/components/displace_examine.vue

@@ -41,7 +41,7 @@
           <div class="value">{{ detailData.policyRemark }}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程信息单号</div>
           <div class="value">{{ detailData.enginRecordNo }}</div>
         </el-col>
         <el-col :span="8" class="item">

+ 2 - 2
src/views/supply/displace/components/displace_form.vue

@@ -59,8 +59,8 @@
         </template>
         <template v-if="mainForm.enginRecordNo">
           <el-col :xs="24" :sm="12" :lg="8">
-            <el-form-item label="工程登录编号" prop="enginRecordNo">
-              <el-input :value="mainForm.enginRecordNo" placeholder="工程登录编号" disabled></el-input>
+            <el-form-item label="工程信息单号" prop="enginRecordNo">
+              <el-input :value="mainForm.enginRecordNo" placeholder="工程信息单号" disabled></el-input>
             </el-form-item>
           </el-col>
         </template>

+ 1 - 1
src/views/supply/displace/components/displace_return.vue

@@ -41,7 +41,7 @@
           <div class="value">{{ detailData.policyRemark }}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程信息单号</div>
           <div class="value">{{ detailData.enginRecordNo }}</div>
         </el-col>
         <el-col :span="8" class="item">

+ 1 - 0
src/views/supply/displace/displace_list copy.vue

@@ -30,6 +30,7 @@
                 <el-date-picker
                   v-model="screenForm.date"
                   type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                   range-separator="至"
                   style="width: 100%"
                   value-format="yyyy-MM-dd HH:mm:ss"

+ 2 - 1
src/views/supply/engin/commerce_list.vue

@@ -44,6 +44,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -209,7 +210,7 @@
             ></el-table-column>
             <el-table-column
               align="left"
-              label="工程登录编号"
+              label="工程信息单号"
               prop="refEnginRecordNo"
               min-width="200"
               show-overflow-tooltip

+ 1 - 1
src/views/supply/engin/components/commerce_detail.vue

@@ -37,7 +37,7 @@
               <div class="value">{{ detailData.refMachineType }}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">工程登录编号</div>
+              <div class="label">工程信息单号</div>
               <div class="value">{{ detailData.refEnginRecordNo }}</div>
             </el-col>
             <el-col :span="8" class="item">

+ 1 - 1
src/views/supply/engin/components/commerce_examine.vue

@@ -33,7 +33,7 @@
           <div class="value">{{ detailData.refMachineType }}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程信息单号</div>
           <div class="value">{{ detailData.refEnginRecordNo }}</div>
         </el-col>
         <el-col :span="8" class="item">

+ 2 - 2
src/views/supply/engin/components/commerce_form.vue

@@ -83,7 +83,7 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程登录编号" prop="enginOrderNum">
+          <el-form-item label="工程信息单号" prop="enginOrderNum">
             <div style="display: flex">
               <el-input v-model="mainForm.enginOrderNum" placeholder="请引用工程登录" disabled />
               <el-button style="margin-left: 10px" @click="openShareDetail">引用</el-button>
@@ -539,7 +539,7 @@ export default {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
         jxsNum: [{ required: true, message: '请输入经销商编码', trigger: 'blur' }],
         jxsName: [{ required: true, message: '请输入经销商名称', trigger: 'blur' }],
-        enginOrderNum: [{ required: true, message: '请输入工程登录编号', trigger: 'blur' }],
+        enginOrderNum: [{ required: true, message: '请输入工程信息单号', trigger: 'blur' }],
         // projectName: [{ required: true, message: '请输入项目类别', trigger: 'blur' }],
         // tradeCategory: [{ required: true, message: '请输入行业类别', trigger: 'blur' }],
         useUnit: [{ required: true, message: '请输入使用单位', trigger: 'blur' }],

+ 1 - 1
src/views/supply/engin/components/commerce_return.vue

@@ -33,7 +33,7 @@
           <div class="value">{{ detailData.refMachineType }}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程信息单号</div>
           <div class="value">{{ detailData.refEnginRecordNo }}</div>
         </el-col>
         <el-col :span="8" class="item">

+ 1 - 1
src/views/supply/engin/components/engin_detail.vue

@@ -9,7 +9,7 @@
     <div class="diy-table-1">
       <el-row>
         <el-col :span="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程信息单号</div>
           <div class="value">{{ detailData.enginInfoNo }}</div>
         </el-col>
         <el-col :span="8" class="item">

+ 1 - 1
src/views/supply/engin/components/engin_examine.vue

@@ -9,7 +9,7 @@
     <div class="diy-table-1">
       <el-row>
         <el-col :span="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程信息单号</div>
           <div class="value">{{ detailData.enginInfoNo }}</div>
         </el-col>
         <el-col :span="8" class="item">

+ 1 - 1
src/views/supply/engin/components/engin_form.vue

@@ -16,7 +16,7 @@
     >
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程登录编号" prop="orderNum">
+          <el-form-item label="工程信息单号" prop="orderNum">
             <el-input v-model="mainForm.orderNum" placeholder="系统自动生成" disabled />
           </el-form-item>
         </el-col>

+ 1 - 1
src/views/supply/engin/components/home_detail.vue

@@ -38,7 +38,7 @@
               <div class="value">{{ detailData.refMachineType }}</div>
             </el-col>
             <el-col :span="8" class="item">
-              <div class="label">工程登录编号</div>
+              <div class="label">工程信息单号</div>
               <div class="value">{{ detailData.refEnginRecordNo }}</div>
             </el-col>
             <el-col :span="8" class="item">

+ 1 - 1
src/views/supply/engin/components/home_examine.vue

@@ -29,7 +29,7 @@
           <div class="value">{{ detailData.customerName }}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程信息单号</div>
           <div class="value">{{ detailData.refEnginRecordNo }}</div>
         </el-col>
         <el-col :span="8" class="item">

+ 4 - 4
src/views/supply/engin/components/home_form.vue

@@ -59,7 +59,7 @@
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
-          <el-form-item label="工程登录编号" prop="loginNum">
+          <el-form-item label="工程信息单号" prop="loginNum">
             <div style="display: flex">
               <el-input v-model="mainForm.loginNum" placeholder="请引用工程登录" disabled />
               <el-button style="margin-left: 10px" @click="openShareDetail">引用</el-button>
@@ -460,7 +460,7 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item prop="loginNum">
-              <el-input v-model="screenForm.loginNum" placeholder="工程登录编号" />
+              <el-input v-model="screenForm.loginNum" placeholder="工程信息单号" />
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -500,7 +500,7 @@
             </template>
           </el-table-column>
           <el-table-column align="center" prop="checkTime" label="工程登录日期" show-overflow-tooltip />
-          <el-table-column align="center" prop="recordNo" label="工程登录编号" show-overflow-tooltip />
+          <el-table-column align="center" prop="recordNo" label="工程信息单号" show-overflow-tooltip />
           <el-table-column align="center" prop="projectName" label="项目类别" show-overflow-tooltip />
           <el-table-column align="center" prop="useUnit" label="使用单位" show-overflow-tooltip />
           <el-table-column align="center" prop="organizationName" label="经销商" show-overflow-tooltip />
@@ -791,7 +791,7 @@ export default {
         // orderDate: [{ required: true, message: '请选择单据日期', trigger: 'change' }],
         jxsNum: [{ required: true, message: '请输入经销商编码', trigger: 'blur' }],
         jxsName: [{ required: true, message: '请输入经销商名称', trigger: 'blur' }],
-        loginNum: [{ required: true, message: '请输入工程登录编号', trigger: 'blur' }],
+        loginNum: [{ required: true, message: '请输入工程信息单号', trigger: 'blur' }],
         // enginName: [{ required: true, message: '请输入项目类别', trigger: 'blur' }],
         // loginType: [{ required: true, message: '请输入行业类别', trigger: 'blur' }],
         company: [{ required: true, message: '请输入使用单位', trigger: 'blur' }],

+ 1 - 1
src/views/supply/engin/components/home_return.vue

@@ -29,7 +29,7 @@
           <div class="value">{{ detailData.customerName }}</div>
         </el-col>
         <el-col :span="8" class="item">
-          <div class="label">工程登录编号</div>
+          <div class="label">工程信息单号</div>
           <div class="value">{{ detailData.refEnginRecordNo }}</div>
         </el-col>
         <el-col :span="8" class="item">

+ 6 - 5
src/views/supply/engin/engin_list.vue

@@ -21,8 +21,8 @@
             <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
               <el-row :gutter="20">
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="工程登录编号" prop="orderNum">
-                    <el-input v-model="screenForm.orderNum" placeholder="请输入工程登录编号"></el-input>
+                  <el-form-item label="工程信息单号" prop="orderNum">
+                    <el-input v-model="screenForm.orderNum" placeholder="请输入工程信息单号"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
@@ -31,8 +31,8 @@
                   </el-form-item>
                 </el-col>
                 <!-- <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="工程登录编号" prop="loginNum">
-                    <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
+                  <el-form-item label="工程信息单号" prop="loginNum">
+                    <el-input v-model="screenForm.loginNum" placeholder="请输入工程信息单号"></el-input>
                   </el-form-item>
                 </el-col> -->
                 <el-col :xs="24" :sm="12" :lg="6">
@@ -45,6 +45,7 @@
                     <el-date-picker
                       v-model="screenForm.orderDate"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -172,7 +173,7 @@
 <!--            <el-table-column align="left" label="金额" sortable prop="price" min-width="160" show-overflow-tooltip />-->
             <el-table-column
               align="left"
-              label="工程登录编号"
+              label="工程信息单号"
               sortable
               prop="enginInfoNo"
               min-width="150"

+ 5 - 3
src/views/supply/engin/home_list.vue

@@ -32,8 +32,8 @@
                 <!--              </el-form-item>-->
                 <!--            </el-col>-->
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="工程登录编号" prop="loginNum">
-                    <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号" />
+                  <el-form-item label="工程信息单号" prop="loginNum">
+                    <el-input v-model="screenForm.loginNum" placeholder="请输入工程信息单号" />
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
@@ -46,6 +46,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -162,6 +163,7 @@
                     <el-date-picker
                       v-model="screenForm.orderTime"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -275,7 +277,7 @@
             <el-table-column align="left" label="制单人" prop="createName" min-width="100" show-overflow-tooltip />
             <el-table-column
               align="left"
-              label="工程登录编号"
+              label="工程信息单号"
               prop="refEnginRecordNo"
               min-width="160"
               show-overflow-tooltip

+ 1 - 0
src/views/supply/implement/commercial_implement_list.vue

@@ -16,6 +16,7 @@
                     <el-date-picker
                       v-model="screenForm.orderTime"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"

+ 4 - 2
src/views/supply/implement/implement_list.vue

@@ -50,8 +50,8 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="工程登录编号" prop="loginNum">
-                    <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
+                  <el-form-item label="工程信息单号" prop="loginNum">
+                    <el-input v-model="screenForm.loginNum" placeholder="请输入工程信息单号"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
@@ -72,6 +72,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+                      :default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -86,6 +87,7 @@
                     <el-date-picker
                       v-model="screenForm.orderDate"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"

+ 4 - 2
src/views/supply/implement/implement_total_list.vue

@@ -49,8 +49,8 @@
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="工程登录编号" prop="loginNum">
-                    <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
+                  <el-form-item label="工程信息单号" prop="loginNum">
+                    <el-input v-model="screenForm.loginNum" placeholder="请输入工程信息单号"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :xs="24" :sm="12" :lg="6">
@@ -78,6 +78,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -92,6 +93,7 @@
                     <el-date-picker
                       v-model="screenForm.orderDate"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"

+ 4 - 0
src/views/supply/implement/nsales_list.vue

@@ -64,6 +64,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -77,6 +78,7 @@
                     <el-date-picker
                       v-model="screenForm.approval"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -90,6 +92,7 @@
                     <el-date-picker
                       v-model="screenForm.printTime"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -138,6 +141,7 @@
                     <el-date-picker
                       v-model="screenForm.invoiceDate"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"

+ 2 - 0
src/views/supply/pickup/pickup_list.vue

@@ -66,6 +66,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -79,6 +80,7 @@
                     <el-date-picker
                       v-model="screenForm.printTime"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/supply/pickup/statistics.vue

@@ -10,6 +10,7 @@
           <el-date-picker
             v-model="screenForm.date"
             type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="开始日期"

+ 2 - 0
src/views/supply/pickup/sum_list.vue

@@ -65,6 +65,7 @@
                   <el-date-picker
                     v-model="screenForm.date"
                     type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"
@@ -78,6 +79,7 @@
                   <el-date-picker
                     v-model="screenForm.printTime"
                     type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                     range-separator="至"
                     style="width: 100%"
                     value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/supply/policy/components/policy_list.vue

@@ -40,6 +40,7 @@
                 <el-date-picker
                   v-model="screenForm.date"
                   type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                   range-separator="至"
                   style="width: 100%"
                   value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/supply/policy/policy_list.vue

@@ -52,6 +52,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/supply/purchase/enter_list.vue

@@ -31,6 +31,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/supply/purchase/purchase_list.vue

@@ -26,6 +26,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/supply/reserve/reserve_list.vue

@@ -54,6 +54,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/supply/retail/retail_list.vue

@@ -44,6 +44,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/supply/return/online_list.vue

@@ -40,6 +40,7 @@
                 <el-date-picker
                   v-model="screenForm.date"
                   type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                   range-separator="至"
                   style="width: 100%"
                   value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/supply/return/return_list.vue

@@ -35,6 +35,7 @@
                 <el-date-picker
                   v-model="screenForm.date"
                   type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                   range-separator="至"
                   style="width: 100%"
                   value-format="yyyy-MM-dd HH:mm:ss"

+ 3 - 0
src/views/supply/sales/sales_list.vue

@@ -79,6 +79,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -92,6 +93,7 @@
                     <el-date-picker
                       v-model="screenForm.approval"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -113,6 +115,7 @@
                     <el-date-picker
                       v-model="screenForm.printTime"
                       type="datetimerange"
+:default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"