sale-client 3.6.220 → 3.6.222

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [ serverRul, localUrl ] = ['http://120.46.92.69:8700/', 'http://120.46.92.69:8700/']
+const [ serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.6.220",
+  "version": "3.6.222",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/FilesManage/UserPaperInfoTest.vue

@@ -33,6 +33,11 @@
           <input class="input_search" placeholder="银行名称" style="width:70%" type="text" v-el:paperaccount
                  v-model="baseinfo.base.f_paper_account">
         </div>
+        <div class="col-sm-4 form-group">
+          <label class="font_normal_body" for="f_contact_user">联系人名</label>
+          <input class="input_search" placeholder="联系人姓名" style="width:60%" type="text" v-el:contactuser
+                 v-model="baseinfo.base.f_contact_user" >
+        </div>
       </div>
       <div class="row">
         <div class="col-sm-8 form-group">

package/src/components/charge/business/ShowCardSellGas.vue

@@ -163,12 +163,7 @@
               <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
                      v-model="model.f_serial_number" placeholder="业务单号">
             </div>
-            <div class="col-sm-4" v-if="!mjshow && model.f_payment == '银行转账'" >
-              <label for="f_serial_number" class=" font_normal_body">银行流水</label>
-              <input class="input_search" style="width:60%"  type="text"
-                     v-model="model.f_serial_number" placeholder="银行流水">
-            </div>
-            <div class="col-sm-4" v-if="mjshow  && model.f_payment == '银行转账'" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
+            <div class="col-sm-4" v-if="model.f_payment == '银行转账'" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
               <label for="f_serial_number" class=" font_normal_body">银行流水</label>
               <input class="input_search" style="width:60%"  type="text" v-validate:f_serial_number='{required: true }'
                      v-model="model.f_serial_number" placeholder="银行流水">

package/src/components/revenue/Common/EticketPrint.vue

@@ -92,7 +92,11 @@ export default {
           resolveMsg: null,
           rejectMsg: '发票打印失败!!'
         })
-        this.return_msg = '开票成功,请前往发票管理页面查看'
+        if (result.data.code === '9999') {
+          this.return_msg = result.data.msg
+        } else {
+          this.return_msg = '开票成功,请前往发票管理页面查看'
+        }
       } catch (error) {
         this.return_msg = '开票失败请前往发票管理页面重试'
         this.$showAlert('电子发票打印出现异常，请联系管理员！！！', 'warning', 5000)

package/src/components/revenue/comprehen/Bill/Eticket/EticketOpenCard.vue

@@ -122,7 +122,7 @@
             </v-select>
           </div>
           <div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
-            <nobr class="col-sm-4"><label class="control-label">发票种类:</label></nobr>
+            <label class="control-label">发票种类:</label>
             <v-select v-model="invoice_type"
                       placeholder='请选择'
                       :value.sync="invoice_type"

package/src/components/revenue/comprehen/Bill/Eticket/EticketOpenPage.vue

@@ -122,8 +122,7 @@
             </v-select>
           </div>
           <div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
-            <nobr class="col-sm-4"><label class="control-label">发票种类:</label></nobr>
-            <v-select v-model="invoice_type"
+            <label class="control-label">发票种类:</label>            <v-select v-model="invoice_type"
                       placeholder='请选择'
                       :value.sync="invoice_type"
                       close-on-select

package/src/components/revenue/comprehen/Bill/EticketV4/EticketRecordList.vue

@@ -149,6 +149,9 @@
             <th>
               <nobr>发票类型</nobr>
             </th>
+            <th>
+              <nobr>开票描述</nobr>
+            </th>
             <th>
               <nobr>收费时间</nobr>
             </th>
@@ -184,6 +187,7 @@
             <th style="text-align:center">{{ row.f_bill_number }}</th>
             <th style="text-align:center">{{ row.f_bill_state }}</th>
             <th style="text-align:center">{{ row.f_charge_type }}</th>
+            <th style="text-align:center">{{ row.f_sign_result }}</th>
             <th style="text-align:center">{{ row.sell_operate_date }}</th>
             <th style="text-align:center">{{ row.f_operate_date }}</th>
             <th style="text-align:center">{{ row.f_operator }}</th>

package/src/filiale/gehua/NewPriceAdjustment.vue

@@ -277,7 +277,7 @@
               <th style="text-align: center;">{{row.f_stair_price2}}</th>
               <th style="text-align: center;">{{row.f_stair_price3}}</th>
               <th style="text-align: center;">
-                <div v-if="!row.f_change_price1">
+                <div v-if="!row.f_surplus_fee">
                   <button type="button" name="button" class="btn btn-link"
                           @click.stop="$parent.$parent.$parent.calculation(row)  && row.states === 1">调价补差
                   </button>
@@ -313,7 +313,7 @@
               <th style="text-align: center;">{{row.f_stair_gas3}}</th>
               <th style="text-align: center;">{{row.f_operate_date}}</th>
               <th style="text-align: center;">
-                <button type="button" name="button" class="btn btn-link" v-if="row.f_change_price1"
+                <button type="button" name="button" class="btn btn-link" v-if="row.f_surplus_fee"
                         @click.stop="$parent.$parent.$parent.delectHand(row)  && row.states === 1">冲正
                 </button>
                 <!--                <button type="button" name="button" class="btn btn-link" v-if="!row.f_new_price"-->

package/src/filiale/gehua/NewPriceAdjustmentSell.vue

@@ -199,7 +199,7 @@
               <th style="text-align: center;">{{row.f_stair_price2}}</th>
               <th style="text-align: center;">{{row.f_stair_price3}}</th>
               <th style="text-align: center;">
-                <div v-if="!row.f_change_price1">
+                <div v-if="!row.f_surplus_fee">
                   <button type="button" name="button" class="btn btn-link"
                           @click.stop="$parent.$parent.$parent.calculation(row)  && row.states === 1">调价补差
                   </button>
@@ -244,7 +244,7 @@
               <th style="text-align: center;">{{row.f_surplus_fee}}</th>
               <th style="text-align: center;">{{row.f_source}}</th>
               <th style="text-align: center;">
-                <button type="button" name="button" class="btn btn-link" v-if="row.f_change_price1"
+                <button type="button" name="button" class="btn btn-link" v-if="row.f_surplus_fee"
                         @click.stop="$parent.$parent.$parent.delectHand(row)  && row.states === 1">冲正
                 </button>
               </th>

package/src/filiale/gehua/NewPriceAdjustmentWebmeter.vue

@@ -201,7 +201,7 @@
               <th style="text-align: center;">{{row.f_stair_price2}}</th>
               <th style="text-align: center;">{{row.f_stair_price3}}</th>
               <th style="text-align: center;">
-                <div v-if="!row.f_change_price1">
+                <div v-if="!row.f_surplus_fee">
                   <button type="button" name="button" class="btn btn-link"
                           @click.stop="$parent.$parent.$parent.calculation(row)  && row.states === 1">调价补差
                   </button>
@@ -248,7 +248,7 @@
               <th style="text-align: center;">{{row.f_surplus_fee}}</th>
               <th style="text-align: center;">{{row.f_source}}</th>
               <th style="text-align: center;">
-                <button type="button" name="button" class="btn btn-link" v-if="row.f_change_price1"
+                <button type="button" name="button" class="btn btn-link" v-if="row.f_surplus_fee"
                         @click.stop="$parent.$parent.$parent.delectHand(row)  && row.states === 1">冲正
                 </button>
               </th>

package/src/filiale/liaoyuan/CardList.vue

@@ -495,7 +495,15 @@
         // if (!this.$login.f.parent.parent.name.includes('统一资源管理')) {
         //   args.condition += `and f_filialeids = '${this.$login.f.f_orgids}'`
         // }
-        args.condition += `and r.f_orgid = '${this.$login.f.orgid}'`
+        if (this.f_orgid) {
+          args.condition += `and u.f_orgid in ${this.f_orgid}`
+        } else {
+          args.condition += `and r.f_orgid = '${this.$login.f.orgid}'`
+        }
+        // args.condition += `and r.f_orgid = '${this.$login.f.orgid}'`
+        if (this.authArr.includes('操作记录查询公司限定')) {
+          args.condition += `and r.f_orgid = '${this.$login.f.orgid}'`
+        }
         if (this.authArr.includes('操作记录查询限定')) {
           args.condition += ` and r.f_operatorid = '${this.$login.f.id}'`
         }

package/src/filiale/liaoyuan/NewPriceAdjustment.vue

@@ -277,7 +277,7 @@
               <th style="text-align: center;">{{row.f_stair_price2}}</th>
               <th style="text-align: center;">{{row.f_stair_price3}}</th>
               <th style="text-align: center;">
-                <div v-if="!row.f_change_price1">
+                <div v-if="!row.f_surplus_fee">
                   <button type="button" name="button" class="btn btn-link"
                           @click.stop="$parent.$parent.$parent.calculation(row)  && row.states === 1">调价补差
                   </button>
@@ -313,7 +313,7 @@
               <th style="text-align: center;">{{row.f_stair_gas3}}</th>
               <th style="text-align: center;">{{row.f_operate_date}}</th>
               <th style="text-align: center;">
-                <button type="button" name="button" class="btn btn-link" v-if="row.f_change_price1"
+                <button type="button" name="button" class="btn btn-link" v-if="row.f_surplus_fee"
                         @click.stop="$parent.$parent.$parent.delectHand(row)  && row.states === 1">冲正
                 </button>
                 <!--                <button type="button" name="button" class="btn btn-link" v-if="!row.f_new_price"-->

package/src/filiale/liaoyuan/NewPriceAdjustmentSell.vue

@@ -199,7 +199,7 @@
               <th style="text-align: center;">{{row.f_stair_price2}}</th>
               <th style="text-align: center;">{{row.f_stair_price3}}</th>
               <th style="text-align: center;">
-                <div v-if="!row.f_change_price1">
+                <div v-if="!row.f_surplus_fee">
                   <button type="button" name="button" class="btn btn-link"
                           @click.stop="$parent.$parent.$parent.calculation(row)  && row.states === 1">调价补差
                   </button>
@@ -244,7 +244,7 @@
               <th style="text-align: center;">{{row.f_surplus_fee}}</th>
               <th style="text-align: center;">{{row.f_source}}</th>
               <th style="text-align: center;">
-                <button type="button" name="button" class="btn btn-link" v-if="row.f_change_price1"
+                <button type="button" name="button" class="btn btn-link" v-if="row.f_surplus_fee"
                         @click.stop="$parent.$parent.$parent.delectHand(row)  && row.states === 1">冲正
                 </button>
               </th>

package/src/filiale/liaoyuan/NewPriceAdjustmentWebmeter.vue

@@ -201,7 +201,7 @@
               <th style="text-align: center;">{{row.f_stair_price2}}</th>
               <th style="text-align: center;">{{row.f_stair_price3}}</th>
               <th style="text-align: center;">
-                <div v-if="!row.f_change_price1">
+                <div v-if="!row.f_surplus_fee">
                   <button type="button" name="button" class="btn btn-link"
                           @click.stop="$parent.$parent.$parent.calculation(row)  && row.states === 1">调价补差
                   </button>
@@ -248,7 +248,7 @@
               <th style="text-align: center;">{{row.f_surplus_fee}}</th>
               <th style="text-align: center;">{{row.f_source}}</th>
               <th style="text-align: center;">
-                <button type="button" name="button" class="btn btn-link" v-if="row.f_change_price1"
+                <button type="button" name="button" class="btn btn-link" v-if="row.f_surplus_fee"
                         @click.stop="$parent.$parent.$parent.delectHand(row)  && row.states === 1">冲正
                 </button>
               </th>

package/src/filiale/shexian/UserBaseInfoNew.vue

@@ -346,7 +346,16 @@
           }
         }
       },
-      openUser () {
+      async openUser () {
+        let param = {
+          tablename: 't_instruct',
+          condition: `f_userfiles_id = '${this.row.f_userfiles_id}' and f_instruct_type = '远程开户' and f_instruct_state = '执行成功'`
+        }
+        let result = await this.$resetpost('rs/sql/saleSingleTable', {data: param},{resolveMsg: '', rejectMsg: ''})
+        if (result.data.length > 0) {
+          this.$showMessage(`该用户已开户，请勿重复发送指令！！！`, ['confirm'])
+          return
+        }
         this.$showMessage(`是否需要给用户进行开户？`, ['confirm', 'cancel']).then(async (res) => {
           if (res === 'confirm') {
             let data = {

package/src/filiale/tongchuan/CardMeterCenter.vue

@@ -184,12 +184,7 @@
               <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
                      v-model="model.f_serial_number" placeholder="业务单号">
             </div>
-            <div class="col-sm-4" v-if="!mjshow && model.f_payment == '银行转账'" >
-              <label for="f_serial_number" class=" font_normal_body">银行流水</label>
-              <input class="input_search" style="width:60%"  type="text"
-                     v-model="model.f_serial_number" placeholder="银行流水">
-            </div>
-            <div class="col-sm-4" v-if="mjshow  && model.f_payment == '银行转账'" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
+            <div class="col-sm-4" v-if="model.f_payment == '银行转账'" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
               <label for="f_serial_number" class=" font_normal_body">银行流水</label>
               <input class="input_search" style="width:60%"  type="text" v-validate:f_serial_number='{required: true }'
                      v-model="model.f_serial_number" placeholder="银行流水">

package/src/filiale/tongchuan/EticketOpenJBPage.vue

@@ -133,8 +133,7 @@
                    v-model="row.f_paper_name" placeholder="开票名称">
           </div>
           <div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
-            <nobr class="col-sm-4"><label class="control-label">发票种类:</label></nobr>
-            <v-select v-model="invoice_type"
+            <label class="control-label">发票种类:</label>            <v-select v-model="invoice_type"
                       placeholder='请选择'
                       :value.sync="invoice_type"
                       close-on-select

package/src/filiale/tongchuan/IOTMeterCenter.vue

@@ -151,12 +151,7 @@
               <input class="input_search" style="width:60%"  type="text" v-validate:f_serial_number='{required: true }'
                      v-model="model.f_serial_number" placeholder="业务单号">
             </div>
-            <div class="col-sm-4" v-if="!mjshow && model.f_payment == '银行转账'" >
-              <label for="f_serial_number" class=" font_normal_body">银行流水</label>
-              <input class="input_search" style="width:60%"  type="text"
-                     v-model="model.f_serial_number" placeholder="银行流水">
-            </div>
-            <div class="col-sm-4" v-if="mjshow  && model.f_payment == '银行转账'" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
+            <div class="col-sm-4" v-if="model.f_payment == '银行转账'" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
               <label for="f_serial_number" class=" font_normal_body">银行流水</label>
               <input class="input_search" style="width:60%"  type="text" v-validate:f_serial_number='{required: true }'
                      v-model="model.f_serial_number" placeholder="银行流水">

package/src/filiale/tongchuan/bill/CustQueryEticket.vue

@@ -158,7 +158,7 @@
                    v-model="row.f_paper_name" placeholder="开票名称">
           </div>
           <div class="col-sm-6 form-group form-input-group">
-            <nobr class="col-sm-4"><label class="control-label">是否征税:</label></nobr>
+            <nobr><label class="control-label">是否征税:</label></nobr>
             <v-select v-model="invoice_is_pax"
                       placeholder='请选择'
                       :value.sync="invoice_is_pax"
@@ -171,7 +171,7 @@
             </v-select>
           </div>
           <div class="col-sm-6 form-group form-input-group" :class="[!invoice_type ? 'has-error' : '']">
-            <nobr class="col-sm-4"><label class="control-label">发票种类:</label></nobr>
+            <label class="control-label">发票种类:</label>
             <v-select v-model="invoice_type"
                       placeholder='请选择'
                       :value.sync="invoice_type"
@@ -220,7 +220,7 @@
     <footer slot="modal-footer" class="modal-footer">
       <button type="button" class="btn button_search"
               v-if="!diytick"
-              :disabled="!(row.f_paper_name&&row.f_address_phone)"
+              :disabled="!(row.f_paper_name&&row.f_buy_address&&row.f_buy_phone)"
               @click='confirm'>确认收费
       </button>
       <button type="button" class="btn button_search"
@@ -330,7 +330,10 @@
               f_address_phone: res.data[0].f_address_phone,
               f_user_id: res.data[0].f_user_id,
               f_userinfo_id: res.data[0].f_userinfo_id,
-              f_userfiles_id: res.data[0].f_userfiles_id}
+              f_userfiles_id: res.data[0].f_userfiles_id,
+              f_buy_phone: res.data[0].f_user_phone,
+              f_buy_address: res.data[0].f_address
+            }
             )
           }
         )

package/src/filiale/tongchuan/bill/EticketPrint.vue

@@ -19,7 +19,7 @@
 </template>
 <script>
 import {HttpResetClass} from 'vue-client'
-import Vue from "vue";
+import Vue from 'vue'
 
 export default {
   title: '电子发票',
@@ -90,7 +90,12 @@ export default {
           }
         }
         // TODO 组织开票数据并保存
-        const res = await this.$resetpost('/invoice/rs/logic/getInvoice', model, {resolveMsg: null, rejectMsg: '开票请求失败'})
+        const res = await this.$resetpost('/invoice/rs/logic/getInvoice', model, {
+          resolveMsg: null,
+          rejectMsg: '开票请求失败',
+          aoteEncrypt: '无',
+          encryKey: '无'
+        })
         if (res.data.code === 200 && res.data.data.code == '0000') {
           this.return_msg = '发票开具成功，请稍后到发票管理页面查看或打印'
         } else {
@@ -123,7 +128,12 @@ export default {
           isTax: 1
         }
         // TODO 组织开票数据并保存
-        const res = await this.$resetpost('/invoice/rs/logic/getInvoice', model, {resolveMsg: null, rejectMsg: '开票请求失败'})
+        const res = await this.$resetpost('/invoice/rs/logic/getInvoice', model, {
+          resolveMsg: null,
+          rejectMsg: '开票请求失败',
+          aoteEncrypt: '无',
+          encryKey: '无'
+        })
         if (res.data.code === 200 && res.data.data.code == '0000') {
           this.return_msg = '发票开具成功，请稍后到发票管理页面查看或打印'
         } else {
@@ -145,16 +155,36 @@ export default {
           f_filialeids: this.$login.f.f_orgids,
           f_buy_name: custModel.f_paper_name,
           f_pay_id: custModel.f_taxpayer_id,
-          f_buy_address: custModel.f_address_phone,
+          f_buy_address: custModel.f_buy_address,
+          f_buy_phone: custModel.f_buy_phone,
           f_mail_push: custModel.f_email,
           f_buy_openbank: custModel.f_paper_account,
+          f_userinfo_id: custModel.f_userinfo_id,
           invoice_show_gas: !!(custModel.amount && custModel.price),
-          detail_price: {amount: custModel.amount, price: custModel.price, name: custModel.name, money: custModel.money},
-          is_pax: invoice_is_pax === '征税'
+          detail_price: {
+            amount: custModel.amount,
+            price: custModel.price,
+            name: custModel.name,
+            money: custModel.money
+          },
+          is_pax: invoice_is_pax === '征税',
+          isTax: invoice_is_pax === '征税' ? 1 : 0,
+          invoice_type: 0,
+          retry: true
         }, custModel)
         // TODO 组织开票数据并保存
-        let ticket_id = await this.$resetpost('rs/logic/TCcombineCustData', model, {resolveMsg: null, rejectMsg: '保存开票信息失败'})
-        return this.openEticketGen(ticket_id.data)
+        const res = await this.$resetpost('/invoice/rs/logic/customInvoice', model, {
+          resolveMsg: null,
+          rejectMsg: '开票请求失败',
+          aoteEncrypt: '无',
+          encryKey: '无'
+        }
+        )
+        if (res.data.code === 200 && res.data.data.code == '0000') {
+          this.return_msg = '发票开具成功，请稍后到发票管理页面查看或打印'
+        } else {
+          this.return_msg = '发票开具失败，请稍后到发票管理页面补打或重开'
+        }
       } catch (error) {
         this.$showAlert(`电子发票开票失败！！请到发票管理重新开票。错误原因: ${JSON.stringify(error)}。`, 'danger', 0)
       }
@@ -230,7 +260,7 @@ export default {
      * */
     async rushRedInvoice_1 (ticket_id) {
       try {
-          // 否则正常打票
+        // 否则正常打票
         let time = 0
         let result = await this.$resetpost('/invoice/rs/tongchuan/rushRed', {eticket_id: ticket_id}, {
           resolveMsg: null,
@@ -238,14 +268,14 @@ export default {
         })
         result = result.data.RESPONSE_FPXX
         if (result && result.RETURN_CODE === '0000') {
-        // TODO 开票成功 保存发票详情
+          // TODO 开票成功 保存发票详情
           await this.save_msg({
             f_eticket_id: ticket_id,
             f_bill_state: '等待查询'
           })
-        // TODO 开票成功 进行查询
+          // TODO 开票成功 进行查询
           let interval = await setInterval(() => {
-          // 2秒一轮回
+            // 2秒一轮回
             let http = new HttpResetClass()
             http.load('POST', '/invoice/rs/tongchuan/queryInvoice', {eticket_id: ticket_id}, {
               resolveMsg: null,
@@ -264,9 +294,9 @@ export default {
               req = req.data.RESPONSE_FPXXXZ
               console.log(req, '查出什么玩意了', time, req.DDBH + '')
               if (req && req.RETURN_CODE === '0000') {
-              // 组织数据
+                // 组织数据
                 clearInterval(interval)
-              // TODO 成功后保存发票详情
+                // TODO 成功后保存发票详情
                 this.save_msg({
                   f_eticket_id: ticket_id,
                   f_bill_code: req.FPDM,
@@ -280,7 +310,7 @@ export default {
                 this.eticket_src = req.PDF_RED_URL
               } else if (req && req.RETURN_CODE !== '0011') {
                 clearInterval(interval)
-              // TODO 失败后保存发票详情
+                // TODO 失败后保存发票详情
                 this.save_msg({
                   f_eticket_id: ticket_id,
                   f_sign_result: req.RETURN_MESSAGE,
@@ -289,8 +319,8 @@ export default {
                 this.return_msg = '电子票查询出错,错误【' + req.RETURN_MESSAGE + '】,错误代码【' + req.RETURN_CODE + '】,请前往发票管理重新尝试'
               } else {
                 if (time == 80) {
-                // 三十秒后无效
-                // TODO 查询失败后保存发票详情
+                  // 三十秒后无效
+                  // TODO 查询失败后保存发票详情
                   this.save_msg({
                     f_eticket_id: ticket_id,
                     f_sign_result: '查询超时请再次尝试。',
@@ -304,7 +334,7 @@ export default {
             })
           }, 1 * 2000)
         } else if (result) {
-        // TODO 查询失败后保存发票详情
+          // TODO 查询失败后保存发票详情
           await this.save_msg({
             f_eticket_id: ticket_id,
             f_sign_result: result.RETURN_MESSAGE,

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import FilialeSale from './filiale/yuncheng/sale'
+import FilialeSale from './filiale/tongchuan/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
 import VueClipboard from 'vue-clipboard2'