Merge branch 'main' of http://10.10.1.6:3080/masada-admin/httpdocs

1 year ago · 7c213a13b4
13 changed files with 31427 additions and 12193 deletions
--- a/wms/account-receivable-excel.php
+++ b/wms/account-receivable-excel.php
@ -16,14 +16,14 @@ $sheet = $spreadsheet->getActiveSheet();
 if ($type == 'facility') {
    $colomnHeader = [
        'T8單據日期','作番號', '合約號', '部門', '經理', '營業員', '客戶名稱', '統一編號', '聯絡地址', '抬頭',
-        '訂金名稱', '訂金合約金額', '訂金應收日期', '訂金目前應收金額', '訂金已收金額', '訂金催收金額', '訂金催收次數',
-        '二次款名稱', '二次款合約金額', '二次款應收日期', '二次款目前應收金額', '二次款已收金額', '二次款催收金額', '二次款催收次數',
-        '貨抵工地款名稱', '貨抵工地款合約金額', '貨抵工地款應收日期', '貨抵工地款目前應收金額', '貨抵工地款已收金額', '貨抵工地款催收金額', '貨抵工地款催收次數',
-        '安裝款名稱', '安裝款合約金額', '安裝款應收日期', '安裝款目前應收金額', '安裝款已收金額', '安裝款催收金額', '安裝款催收次數',
-        '試車款名稱', '試車款合約金額', '試車款應收日期', '試車款目前應收金額', '試車款已收金額', '試車款催收金額', '試車款催收次數',
-        '官檢款名稱', '官檢款合約金額', '官檢款應收日期', '官檢款目前應收金額', '官檢款已收金額', '官檢款催收金額', '官檢款催收次數',
-        '交車款名稱', '交車款合約金額', '交車款應收日期', '交車款目前應收金額', '交車款已收金額', '交車款催收金額', '交車款催收次數',
-        '尾款名稱', '尾款金額', '尾款應收日期', '尾款應收金額', '尾款已收金額', '尾款催收金額', '尾款催收次數',
+        '訂金名稱', '訂金合約金額', '訂金應收日期', '訂金目前應收金額','訂金已開金額','訂金未開金額', '訂金已收金額', '訂金催收金額', '訂金催收次數',
+        '二次款名稱', '二次款合約金額', '二次款應收日期', '二次款目前應收金額','二次款已開金額','二次款未開金額', '二次款已收金額', '二次款催收金額', '二次款催收次數',
+        '貨抵工地款名稱', '貨抵工地款合約金額', '貨抵工地款應收日期', '貨抵工地款目前應收金額','貨抵工地款已開金額','貨抵工地款未開金額', '貨抵工地款已收金額', '貨抵工地款催收金額', '貨抵工地款催收次數',
+        '安裝款名稱', '安裝款合約金額', '安裝款應收日期', '安裝款目前應收金額','安裝款已開金額','安裝款未開金額', '安裝款已收金額', '安裝款催收金額', '安裝款催收次數',
+        '試車款名稱', '試車款合約金額', '試車款應收日期', '試車款目前應收金額','試車款已開金額','試車款未開金額', '試車款已收金額', '試車款催收金額', '試車款催收次數',
+        '官檢款名稱', '官檢款合約金額', '官檢款應收日期', '官檢款目前應收金額','官檢款已開金額','官檢款未開金額', '官檢款已收金額', '官檢款催收金額', '官檢款催收次數',
+        '交車款名稱', '交車款合約金額', '交車款應收日期', '交車款目前應收金額','交車款已開金額','交車款未開金額', '交車款已收金額', '交車款催收金額', '交車款催收次數',
+        '尾款名稱', '尾款金額', '尾款應收日期', '尾款應收金額','尾款已開金額','尾款未開金額', '尾款已收金額', '尾款催收金額', '尾款催收次數',
        '作番狀態', '合約-設備金額','合約-安裝金額','作番合約總金額', '作番總應收金額'
    ];
    $sheet->fromArray($colomnHeader, NULL, 'A1');
--- a/wms/account-receivable-facility.xlsx
+++ b/wms/account-receivable-facility.xlsx
--- a/wms/account-receivable-index-ing.php
+++ b/wms/account-receivable-index-ing.php
--- a/wms/account-receivable-index.php
+++ b/wms/account-receivable-index.php
@ -2024,6 +2024,9 @@ $facility_exclude_boga_data = json_encode($facility_exclude_boga_array);
        margin-top: .5rem;

    }
+    .hiddenTable {
+        display: none;
+    }
 </style>

 <div style="width: 98%;margin: 1%;">
--- a/wms/account-receivable-test.xlsx
+++ b/wms/account-receivable-test.xlsx
--- a/wms/account_receivable_sql_file.sql
+++ b/wms/account_receivable_sql_file.sql
--- a/wms/cont/apply_form.php
+++ b/wms/cont/apply_form.php
@ -279,9 +279,7 @@ if ($result['department_id'] == 'M0137' || $result['department_id'] == 'M0086' |
 <script type="text/javascript" src="<?php echo base_url('js/wf_property.js?') . rand(10, 100); ?>"></script>
 <script type="text/javascript" src="<?php echo base_url('js/flow_chart.js?' . rand(10, 100)); ?>"></script>
 <script src="<?php echo base_url('js/validate/jquery.validate.min.js?' . rand(10, 100)); ?>"></script>
-<script src="<?php echo base_url('js/validate/messages_zh_TW.js?' . rand(10, 100)); ?>">
-
-</script>
+<script src="<?php echo base_url('js/validate/messages_zh_TW.js?' . rand(10, 100)); ?>"></script>
 <link rel="stylesheet" type="text/css" href="<?php echo base_url('css/form.css?') . rand(10, 100); ?>" />
 <script type="text/javascript">
 	window.param = {
@ -387,7 +385,7 @@ if ($result['department_id'] == 'M0137' || $result['department_id'] == 'M0086' |
 			$('#reg_del').val(regDelStr);
 		});
 	});
-	addRow = function() {
+	const addRow = function() {
 		if ($('#maintain_kind').val() == "") {
 			alert("請選擇保養方式！");
 			$('#maintain_kind').eq(0).focus();
@ -482,7 +480,7 @@ if ($result['department_id'] == 'M0137' || $result['department_id'] == 'M0086' |

 		});
 	}
-	delRow = function(btn) {
+	const delRow = function(btn) {
 		if ($(btn).attr('name') == 'btn1') {
 			//console.log($(btn).parent().parent().prev('tr').find('input[id=register_code]').val());
 			regDelStr += $(btn).parent().parent().find('input[id=register_code]').val() + ",";
@ -494,7 +492,7 @@ if ($result['department_id'] == 'M0137' || $result['department_id'] == 'M0086' |
 		}
 		$(btn).parent().parent().remove();
 	}
-	setStandPrice = function(p, obj) {
+	const setStandPrice = function(p, obj) {
 		$.ajax({
 			url: '../cont/t.php',
 			data: p,
@ -530,7 +528,7 @@ if ($result['department_id'] == 'M0137' || $result['department_id'] == 'M0086' |
 		});

 	}
-	addNewBrand = function() {
+	const addNewBrand = function() {
 		var new_brand = $("#new_brand").val();
 		if (new_brand != '') {
 			p = {
--- a/wms/contract/contract-new-apply.php
+++ b/wms/contract/contract-new-apply.php
@ -577,7 +577,7 @@ $person = $contract['person'];
                            <?php
                            if (($user_id === "M0107" || $user_id == "TEST02") && $contract['progress'] <= 1) {
                                echo "同意(上呈)";
-                            } elseif (($user_id === "M0060" || $user_id == "TEST03") && $contract['progress'] == 2) {
+                                // } elseif (($user_id === "M0060" || $user_id == "TEST03") && $contract['progress'] == 2) {
                                echo "同意(結案)";
                            }
                            ?>
--- a/wms/mkt/assets/js/alpine.js
+++ b/wms/mkt/assets/js/alpine.js
@ -134,7 +134,7 @@ const priceOptionSelect = ()=>{
        options_arr: {
            1:'標配',
            2:'選配',
-            3:'選配'
+            3:'加價'
        },
        btntype: 1,
        buttons: [],
@ -197,16 +197,16 @@ const priceOptionSelect = ()=>{
 const pricereviewOptionSelect = () => {
    return {
        init() {
-            console.log(options);
            this.optionCategory = 0
            this.initButtons();
        },
+        id: 1233,
        options: options,
        orioptions: options,
        optionalArr: {
            1:'標配',
            2:'選配',
-            3:'選配',
+            3:'加價',
        },
        searchtext: '',
        kind: 0,
@ -281,15 +281,14 @@ const pricereviewOptionSelect = ()=>{
        },
        searchOptions(e) {
            this.reloadOptions();
-            // let val = e.target.value.toLowerCase()
-            let val = this.searchtext.toLowerCase()
+            let val = e.target.value.toLowerCase()
            this.options = (this.options).filter(option=>{
                if(option.group_name == null) option.group_name = ''
                if(option.spec == null) option.spec = ''
                if(option.memo == null) option.memo = ''
                if(option.price == null) option.price = 0
                if(option.unit == null) option.unit = ''
-                return option.group_name.toLowerCase().includes(val) || option.memo.toLowerCase().includes(val) || option.spec.toLowerCase().includes(val) || option.unit.includes(val) || String(option.price).includes(val)
+                return option.group_name.includes(val) || option.memo.toLowerCase().includes(val) || option.spec.toLowerCase().includes(val) || option.unit.includes(val) || String(option.price).includes(val)
            })
        }

--- a/wms/mkt/pricereview-create.php
+++ b/wms/mkt/pricereview-create.php
@ -1051,6 +1051,11 @@ $option_str .= "</tbody></table>";
                optionSeatArr.push($(this).html() + "@@");
            })
            $('#option_seat_all').val(optionSeatArr);
+            var optionID = [];
+            $("td[class='_optionid']").each(function() {
+                optionID.push($(this).val());
+            })
+            $('#optionid_all').val()
            var optionUnitPriceArr = [];
            $("input[name='option_unit_price']").each(function() {
                optionUnitPriceArr.push($(this).val().replace(/[,]+/g, ""));
@ -1078,11 +1083,11 @@ $option_str .= "</tbody></table>";
            $('#option_relate_facil_all').val(optionRelateFacilArr);
            var mnIdArr = [];

-
-
            $("input[name='mn_id']").each(function() {
                mnIdArr.push($(this).val());
            })
+
+
            $('#mn_id_all').val(mnIdArr);
            var mnKindArr = [];
            $("select[name='mn_kind']").each(function() {
@ -1265,6 +1270,7 @@ $options = $stmt->fetchAll(PDO::FETCH_ASSOC);
                <table id="" class="table table-striped table-bordered" style="width:100%">
                    <thead>
                        <tr class="kind-col">
+                            <th scope='col'>ID</th>
                            <th scope="col" nowrap>名稱</th>
                            <th scope="col" nowrap>規格</th>
                            <th scope="col" nowrap>備註</th>
@ -1276,6 +1282,7 @@ $options = $stmt->fetchAll(PDO::FETCH_ASSOC);
                    <tbody>
                        <template x-for="option in options">
                            <tr style="cursor:pointer">
+                                <td x-text='option.id' class='_optionid'></td>
                                <td x-text="option.group_name"> </td>
                                <td x-text="option.spec"></td>
                                <td x-text="option.memo"></td>
@ -1934,7 +1941,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
                                <td><input type="text" name="option_unit_price" class="form-control dollar-right" size="8" value="<?php echo number_format($v["item_unit_price"]); ?>" readonly></td>
                                <td><input type="text" name="option_qty" class="form-control" size="2" maxlength="2" value="<?php echo $v["item_qty"]; ?>"></td>
                                <td><input type="text" name="option_price_bp" class="form-control dollar-right" size="8" value="<?php echo number_format($v["item_price_bp"]); ?>" readonly>
-                                    <input type="hidden" name="item_group" value="B"><input type="hidden" name="op_id" value="<?php echo $v["price_id"]; ?>">
+                                    <input type="hidden" name="item_group" value="B"><input type="hidden" name="op_id" value="<?php echo $v["id"]; ?>">
                                </td>
                                <td><input type="text" name="option_memo" class="form-control" size="20" values="<?php echo $v["memo"]; ?>"></td>
                                <td name="option_relate_facil"></td>
@ -2479,7 +2486,8 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
 <input type="hidden" name="pay_amount_all" id="pay_amount_all">
 <input type="hidden" name="pay_period_all" id="pay_period_all">
 <input type="hidden" name="vol_no" id="vol_no" value="<?php echo $vol_no; ?>">
-<input type="hidden" name="op_id_all" id="op_id_all">
+<!-- <input type="hidden" name="op_id_all" id="op_id_all"> -->
+<input type="hidden" name="optionid_all" id="optionid_all">
 <input type="hidden" name="option_seat_all" id="option_seat_all">
 <input type="hidden" name="option_unit_price_all" id="option_unit_price_all">
 <input type="hidden" name="option_qty_all" id="option_qty_all">
--- a/wms/mkt/pricereview-record-submit.php
+++ b/wms/mkt/pricereview-record-submit.php
@ -1,7 +1,9 @@
 <?php
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
-    // print_r($_POST);
-    // exit;
+    echo '<pre>';
+    print_r($_POST);
+    echo '</pre>';
+    exit;
    foreach ($_POST as $k => $v) {
        $$k = htmlspecialchars(stripslashes(trim($v)));
    }
--- a/wms/mkt/pricereview_repair-record-submit.php
+++ b/wms/mkt/pricereview_repair-record-submit.php
@ -1,8 +1,4 @@
 <?php
-// echo '<pre>';
-// print_r($_POST);
-// echo '</pre>';
-// exit();
 if ($_SERVER["REQUEST_METHOD"] == "POST") {
    //print_r($_POST);exit;
    foreach ($_POST as $k => $v) {
--- a/wms/sign/sign_form.php
+++ b/wms/sign/sign_form.php
@ -599,4 +599,3 @@ function  base_url($url)
    </div>

 </body>
-<?php ?>