M0117
/
gary_wms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

合併衝突

gary
10994015 1 year ago
parent
9cf3bfa102
commit
26f850a529
5 changed files with 378 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 317
      wms/contract/contract-new-apply.php
  2. 16
      wms/contract/js/alpine.js
  3. 86
      wms/contract/styles/style.css
  4. 2
      wms/contract/styles/style.css.map
  5. 2
      wms/contract/styles/style.scss

317
wms/contract/contract-new-apply.php
View File

@ -1,4 +1,7 @@
<<<<<<< HEAD
=======
>>>>>>> 7b37600f (合約書申請 新梯 1116)
<?php <?php
include_once("../header.php"); include_once("../header.php");
require_once("./conn.php"); require_once("./conn.php");
@ -9,6 +12,7 @@ if(!(isset($_GET['id']) && !empty($_GET['id']))){
exit; exit;
} }
$id = $_GET["id"]; $id = $_GET["id"];
<<<<<<< HEAD
$sql_str = "SELECT * FROM contract_new_apply WHERE mid = :mid"; $sql_str = "SELECT * FROM contract_new_apply WHERE mid = :mid";
$stmt = $conn->prepare($sql_str); $stmt = $conn->prepare($sql_str);
@ -66,6 +70,36 @@ if(empty($contract_new_apply)){
<link rel="stylesheet" href="semantic/dist/semantic.min.css"> <link rel="stylesheet" href="semantic/dist/semantic.min.css">
<script defer src="./js/alpinejs/cdn.min.js"></script> <script defer src="./js/alpinejs/cdn.min.js"></script>
<script src="./js/axios/axios.min.js"></script> <script src="./js/axios/axios.min.js"></script>
=======
$sql_str = "SELECT pricereview_main.*, account.name as accountname
FROM pricereview_main
JOIN account ON pricereview_main.person = account.accountid
WHERE pricereview_main.id = :id";
$stmt = $conn->prepare($sql_str);
$stmt->bindParam(':id',$id);
$stmt->execute();
$contract = $stmt->fetch(PDO::FETCH_ASSOC);
$accounttype = "M";
$sql_str = "SELECT * FROM account WHERE accounttype = :accounttype";
$stmt = $conn->prepare($sql_str);
$stmt->bindParam(':accounttype',$accounttype);
$stmt->execute();
$persons = $stmt->fetchAll(PDO::FETCH_ASSOC);
$sql_str = "SELECT * FROM hope_elevator_customer WHERE vol_no = :vol_no ORDER BY created_at DESC";
$stmt = $conn->prepare($sql_str);
$stmt->bindParam(':vol_no', $contract['contractno']);
$stmt->execute();
$customer = $stmt->fetch(PDO::FETCH_ASSOC);
print_r($customer);
?>
<link rel="stylesheet" href="./styles/style.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css" integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<script defer src="./js/alpinejs/cdn.min.js"></script>
<script src="./js/axios/axios.min.js"></script>
>>>>>>> 7b37600f (合約書申請 新梯 1116)
<div class="contract-new-apply-component" x-data="contractNewApply"> <div class="contract-new-apply-component" x-data="contractNewApply">
<div class="form" method="post" id="form" enctype="multipart/form-data" > <div class="form" method="post" id="form" enctype="multipart/form-data" >
<input type="hidden" name='form_name' value="main_form" /> <input type="hidden" name='form_name' value="main_form" />
@ -91,6 +125,7 @@ if(empty($contract_new_apply)){
<tr> <tr>
<td style="vertical-align: middle">卷號</td> <td style="vertical-align: middle">卷號</td>
<td> <td>
<<<<<<< HEAD
<div class="fixed" x-text="data.vol_no"></div> <div class="fixed" x-text="data.vol_no"></div>
<!-- <input class="form-control disabled_select" type="text" x-model="data.vol_no" > --> <!-- <input class="form-control disabled_select" type="text" x-model="data.vol_no" > -->
<!-- <p class="alerttext" x-show="data.vol_no==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> --> <!-- <p class="alerttext" x-show="data.vol_no==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> -->
@ -98,6 +133,19 @@ if(empty($contract_new_apply)){
<td style="vertical-align: middle">統一編號</td> <td style="vertical-align: middle">統一編號</td>
<td> <td>
<input class="form-control disabled_select" type="text" x-model="data.vat" > <input class="form-control disabled_select" type="text" x-model="data.vat" >
=======
<input class="form-control disabled_select" type="text" x-model="data.vol_no" >
<p class="alerttext" x-show="data.vol_no==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td>
<td style="vertical-align: middle">營業員</td>
<td>
<select name="" id="" x-model="data.salesman">
<option value="">請選擇營業員</option>
<?php foreach($persons as $person) : ?>
<option value="<?= $person["accountid"] ?>"><?= $person['accountid'] . ' - ' . $person["name"] ?></option>
<?php endforeach ?>
</select>
>>>>>>> 7b37600f (合約書申請 新梯 1116)
<p class="alerttext" x-show="data.salesman==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.salesman==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle">合約書申請日期</td> <td style="vertical-align: middle">合約書申請日期</td>
@ -115,7 +163,11 @@ if(empty($contract_new_apply)){
</tr> </tr>
<tr> <tr>
<td style="vertical-align: middle">案件名稱</td> <td style="vertical-align: middle">案件名稱</td>
<<<<<<< HEAD
<td style="vertical-align: middle" colspan="3"> <td style="vertical-align: middle" colspan="3">
=======
<td style="vertical-align: middle">
>>>>>>> 7b37600f (合約書申請 新梯 1116)
<input class="form-control disabled_select" type="text" x-model="data.case_name" > <input class="form-control disabled_select" type="text" x-model="data.case_name" >
<p class="alerttext" x-show="data.case_name==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.case_name==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
@ -129,6 +181,14 @@ if(empty($contract_new_apply)){
<input class="form-control disabled_select" type="text" x-model="data.manager" > <input class="form-control disabled_select" type="text" x-model="data.manager" >
<p class="alerttext" x-show="data.manager==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.manager==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<<<<<<< HEAD
=======
<td style="vertical-align: middle">統一編號</td>
<td style="vertical-align: middle">
<input class="form-control disabled_select" type="text" x-model="data.vat" >
<p class="alerttext" x-show="data.vat==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td>
>>>>>>> 7b37600f (合約書申請 新梯 1116)
</tr> </tr>
<tr> <tr>
<td style="vertical-align: middle">含稅給約總價</td> <td style="vertical-align: middle">含稅給約總價</td>
@ -155,6 +215,7 @@ if(empty($contract_new_apply)){
</td> </td>
<td style="vertical-align: middle">完工期限</td> <td style="vertical-align: middle">完工期限</td>
<td style="vertical-align: middle" colspan=3> <td style="vertical-align: middle" colspan=3>
<<<<<<< HEAD
<div class="ui labeled input"> <div class="ui labeled input">
<div class="ui label"> <div class="ui label">
貨抵工地 貨抵工地
@ -169,11 +230,15 @@ if(empty($contract_new_apply)){
</div> </div>
</div> </div>
<!-- <input class="form-control disabled_select" type="text" x-model="data.deadline" > --> <!-- <input class="form-control disabled_select" type="text" x-model="data.deadline" > -->
=======
<input class="form-control disabled_select" type="text" x-model="data.deadline" >
>>>>>>> 7b37600f (合約書申請 新梯 1116)
<p class="alerttext" x-show="data.deadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.deadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="vertical-align: middle">附則</td> <td style="vertical-align: middle">附則</td>
<<<<<<< HEAD
<td style="vertical-align: middle" colspan=3> <td style="vertical-align: middle" colspan=3>
<div class="ui labeled input"> <div class="ui labeled input">
<div class="ui label"> <div class="ui label">
@ -201,10 +266,24 @@ if(empty($contract_new_apply)){
<tr> <tr>
<td style="vertical-align: middle">交貨地點</td> <td style="vertical-align: middle">交貨地點</td>
<td style="vertical-align: middle" colspan=3> <td style="vertical-align: middle" colspan=3>
=======
<td style="vertical-align: middle">
<input class="form-control disabled_select" type="text" x-model="data.regulations" >
<p class="alerttext" x-show="data.regulations==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td>
<td style="vertical-align: middle">免保期限</td>
<td style="vertical-align: middle">
<input class="form-control disabled_select" type="text" x-model="data.freedeadline" >
<p class="alerttext" x-show="data.freedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td>
<td style="vertical-align: middle">交貨地點</td>
<td style="vertical-align: middle">
>>>>>>> 7b37600f (合約書申請 新梯 1116)
<input class="form-control disabled_select" type="text" x-model="data.tradeaddress" > <input class="form-control disabled_select" type="text" x-model="data.tradeaddress" >
<p class="alerttext" x-show="data.tradeaddress==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.tradeaddress==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
<td style="vertical-align: middle">交貨期限</td> <td style="vertical-align: middle">交貨期限</td>
<<<<<<< HEAD
<td style="vertical-align: middle" colspan=3> <td style="vertical-align: middle" colspan=3>
<div class="ui labeled input"> <div class="ui labeled input">
<div class="ui label"> <div class="ui label">
@ -215,6 +294,10 @@ if(empty($contract_new_apply)){
天出貨 天出貨
</div> </div>
</div> </div>
=======
<td style="vertical-align: middle">
<input class="form-control disabled_select" type="text" x-model="data.tradedeadline" >
>>>>>>> 7b37600f (合約書申請 新梯 1116)
<p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p> <p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td> </td>
</tr> </tr>
@ -238,6 +321,7 @@ if(empty($contract_new_apply)){
</tr> </tr>
</thead> </thead>
<tbody style="font-weight: bolder;margin-bottom: 20px"> <tbody style="font-weight: bolder;margin-bottom: 20px">
<<<<<<< HEAD
<template x-for="(item, idx) in data.items"> <template x-for="(item, idx) in data.items">
<tr> <tr>
<td style="vertical-align: middle"><p x-text="idx+1"></p></td> <td style="vertical-align: middle"><p x-text="idx+1"></p></td>
@ -255,6 +339,23 @@ if(empty($contract_new_apply)){
</td> </td>
</tr> </tr>
</template> </template>
=======
<tr>
<td style="vertical-align: middle">1</td>
<td colspan="3" style="vertical-align: middle">
<input class="form-control disabled_select" type="text" value="MAE100-6 *4-2S45" >
<p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td>
<td style="vertical-align: middle">
<input class="form-control disabled_select" type="number" value="6" >
<p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td>
<td colspan="3" style="vertical-align: middle">
<input class="form-control disabled_select" type="number" value="3180000" >
<p class="alerttext" x-show="data.tradedeadline==''"><i class="fa-solid fa-circle-xmark"></i>未填寫</p>
</td>
</tr>
>>>>>>> 7b37600f (合約書申請 新梯 1116)
</tbody> </tbody>
</table> </table>
<table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%"> <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
@ -286,6 +387,7 @@ if(empty($contract_new_apply)){
</td> </td>
</tr> </tr>
</thead> </thead>
<<<<<<< HEAD
<tbody style="font-weight: bolder;margin-bottom: 20px" > <tbody style="font-weight: bolder;margin-bottom: 20px" >
<?php <?php
$day = 0; $day = 0;
@ -380,6 +482,191 @@ if(empty($contract_new_apply)){
</td> </td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
=======
<tbody style="font-weight: bolder;margin-bottom: 20px">
<tr>
<td>
<p style='text-align:center'>銷售</p>
</td>
<td>
<p style='text-align:center'>訂金</p>
</td>
<td>
<p style='text-align:center'>簽約後X天付訂金</p>
</td>
<td>
<p style='text-align:center'>合約日</p>
</td>
<td>
<p style='text-align:center'>30天</p>
</td>
<td>
<p style='text-align:center'>30天</p>
</td>
<td>
<p style='text-align:center'>20%</p>
</td>
<td>
<p style='text-align:center'>636000</p>
</td>
</tr>
<tr>
<td>
<p style='text-align:center'>銷售</p>
</td>
<td>
<p style='text-align:center'>二次款</p>
</td>
<td>
<p style='text-align:center'>簽約後X天付二次款</p>
</td>
<td>
<p style='text-align:center'>合約日</p>
</td>
<td>
<p style='text-align:center'>30天</p>
</td>
<td>
<p style='text-align:center'>30天</p>
</td>
<td>
<p style='text-align:center'>0%%</p>
</td>
<td>
<p style='text-align:center'>0</p>
</td>
</tr>
<tr>
<td>
<p style='text-align:center'>銷售</p>
</td>
<td>
<p style='text-align:center'>貨到款</p>
</td>
<td>
<p style='text-align:center'>貨抵工地付貨到款</p>
</td>
<td>
<p style='text-align:center'>出貨日</p>
</td>
<td>
<p style='text-align:center'>-</p>
</td>
<td>
<p style='text-align:center'>30天</p>
</td>
<td>
<p style='text-align:center'>50%</p>
</td>
<td>
<p style='text-align:center'>1590000</p>
</td>
</tr>
<tr>
<td>
<p style='text-align:center'></p>
</td>
<td>
<p style='text-align:center'></p>
</td>
<td>
<p style='text-align:center'></p>
</td>
<td>
<p style='text-align:center'></p>
</td>
<td>
<p style='text-align:center'></p>
</td>
<td>
<p style='text-align:center'></p>
</td>
<td>
<p style='text-align:center'></p>
</td>
<td>
<p style='text-align:center'></p>
</td>
</tr>
<tr>
<td>
<p style='text-align:center'>安裝</p>
</td>
<td>
<p style='text-align:center'>安裝款</p>
</td>
<td>
<p style='text-align:center'>安裝完成後X天收款</p>
</td>
<td>
<p style='text-align:center'>竣檢日</p>
</td>
<td>
<p style='text-align:center'>30天</p>
</td>
<td>
<p style='text-align:center'>30天</p>
</td>
<td>
<p style='text-align:center'>20%</p>
</td>
<td>
<p style='text-align:center'>636000</p>
</td>
</tr>
<tr>
<td>
<p style='text-align:center'>安裝</p>
</td>
<td>
<p style='text-align:center'>尾款</p>
</td>
<td>
<p style='text-align:center'>交車後X天付尾款</p>
</td>
<td>
<p style='text-align:center'>交車日</p>
</td>
<td>
<p style='text-align:center'>0天</p>
</td>
<td>
<p style='text-align:center'>30天</p>
</td>
<td>
<p style='text-align:center'>10%</p>
</td>
<td>
<p style='text-align:center'>318000</p>
</td>
</tr>
<tr>
<td>
<p style='text-align:center'></p>
</td>
<td>
<p style='text-align:center'></p>
</td>
<td>
<p style='text-align:center'></p>
</td>
<td>
<p style='text-align:center'></p>
</td>
<td>
<p style='text-align:center'></p>
</td>
<td>
<p style='text-align:center'></p>
</td>
<td>
<p style='text-align:center'></p>
</td>
<td>
<p style='text-align:center'></p>
</td>
</tr>
>>>>>>> 7b37600f (合約書申請 新梯 1116)
</tbody> </tbody>
</table> </table>
<table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%"> <table class="table table-bordered query-table table-striped table-bordered display compact" style="width:99%;margin-left:.5%">
@ -393,6 +680,7 @@ if(empty($contract_new_apply)){
<tbody> <tbody>
<tr> <tr>
<td style="font-weight:bold">業務部協理</td> <td style="font-weight:bold">業務部協理</td>
<<<<<<< HEAD
<td> <td>
<template x-if="false"> <template x-if="false">
<span class="failtext">已退件</span> <span class="failtext">已退件</span>
@ -430,6 +718,15 @@ if(empty($contract_new_apply)){
</td> </td>
<td style="font-weight:bold">營業員</td> <td style="font-weight:bold">營業員</td>
<td><span x-text="data.salesmanname + '(' + data.salesman + ')'"></span></td> <td><span x-text="data.salesmanname + '(' + data.salesman + ')'"></span></td>
=======
<td><span class="successtext">已通過</span></td>
<td style="font-weight:bold">業務部承辦人</td>
<td><span class="successtext">已通過</span></td>
<td style="font-weight:bold">營業經理</td>
<td><span class="successtext">已通過</span></td>
<td style="font-weight:bold">營業員</td>
<td><span class="successtext">已通過</span></td>
>>>>>>> 7b37600f (合約書申請 新梯 1116)
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -441,6 +738,7 @@ if(empty($contract_new_apply)){
<div class="loader"></div> <div class="loader"></div>
</template> </template>
</button> </button>
<<<<<<< HEAD
<button x-show="true" x-on:click="storageFn()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn"> <button x-show="true" x-on:click="storageFn()" :disabled="isLoading" type="button" class="btn btn-primary btn-lg pull-right savebtn">
<template x-if="!isLoading"> <template x-if="!isLoading">
<span>暫存</span> <span>暫存</span>
@ -449,10 +747,13 @@ if(empty($contract_new_apply)){
<div class="loader"></div> <div class="loader"></div>
</template> </template>
</button> </button>
=======
>>>>>>> 7b37600f (合約書申請 新梯 1116)
</div> </div>
</div> </div>
</div> </div>
<<<<<<< HEAD
<script src="./js/jquery/jquery-3.1.1.min.js"></script> <script src="./js/jquery/jquery-3.1.1.min.js"></script>
<script src="semantic/dist/semantic.min.js" ></script> <script src="semantic/dist/semantic.min.js" ></script>
<script src="./js/alpine.js"></script> <script src="./js/alpine.js"></script>
@ -474,3 +775,19 @@ if(empty($contract_new_apply)){
const mid = '<?php echo $_GET['id']; ?>'; const mid = '<?php echo $_GET['id']; ?>';
console.log(items) console.log(items)
</script> </script>
=======
<script src="./js/alpine.js"></script>
<script>
const contractno = '<?php echo $contract['contractno'] ?>'
const salesman = '<?php echo $contract['person'] ?>';
const apply_date = '<?php echo date('Y-m-d') ?>';
const case_name = '<?php echo $contract['case_name'] ?>'
const company = '<?php echo $contract['company'] ?>'
const manager = '<?php echo $customer['manager'] ?>'
const vat = '<?php echo $customer['uscc'] ?>'
const price_total = <?php echo $contract['price_total'] ?>
console.log(123)
</script>
>>>>>>> 7b37600f (合約書申請 新梯 1116)

16
wms/contract/js/alpine.js
View File

@ -1176,10 +1176,15 @@ const contractNewApply = ()=>{
step:1, step:1,
isLoading:false, isLoading:false,
data:{ data:{
<<<<<<< HEAD
mid: mid, mid: mid,
vol_no: contractno, vol_no: contractno,
salesman: salesman, salesman: salesman,
salesmanname:salesmanname, salesmanname:salesmanname,
=======
vol_no: contractno,
salesman: salesman,
>>>>>>> 7b37600f (合約書申請 新梯 1116)
apply_date: apply_date, apply_date: apply_date,
apply_type:'A', apply_type:'A',
case_name: case_name, case_name: case_name,
@ -1187,6 +1192,7 @@ const contractNewApply = ()=>{
manager: manager, manager: manager,
vat: vat, vat: vat,
total_price: price_total, total_price: price_total,
<<<<<<< HEAD
price_a: price_a, price_a: price_a,
price_b: price_b, price_b: price_b,
address: address, address: address,
@ -1254,6 +1260,16 @@ const contractNewApply = ()=>{
alert('儲存失敗！可能為以下錯誤:\n' + error.response.data) alert('儲存失敗！可能為以下錯誤:\n' + error.response.data)
this.isLoading = false this.isLoading = false
}) })
=======
price_a:'',
price_b:'',
address:'',
deadline:'',
regulations:'', //附則
freedeadline:'', //免保期限
tradeaddress:'', //交貨地點
tradedeadline:'', //交貨期限
>>>>>>> 7b37600f (合約書申請 新梯 1116)
} }
} }
} }

86
wms/contract/styles/style.css
View File

@ -541,14 +541,14 @@ main table td, main table th {
transform: rotate(360deg); transform: rotate(360deg);
} }
} }
.contract-input-component .form, .contract-management .form, .contract-new-apply-component .form { .contract-input-component .contract-input-component .form, .contract-input-component .contract-management .form, .contract-input-component .contract-new-apply-component .form, .contract-management .contract-input-component .form, .contract-management .contract-management .form, .contract-management .contract-new-apply-component .form, .contract-new-apply-component .contract-input-component .form, .contract-new-apply-component .contract-management .form, .contract-new-apply-component .contract-new-apply-component .form {
margin: 0 auto; margin: 0 auto;
} }
.contract-input-component .form .dropdown, .contract-management .form .dropdown, .contract-new-apply-component .form .dropdown { .contract-input-component .contract-input-component .form .dropdown, .contract-input-component .contract-management .form .dropdown, .contract-input-component .contract-new-apply-component .form .dropdown, .contract-management .contract-input-component .form .dropdown, .contract-management .contract-management .form .dropdown, .contract-management .contract-new-apply-component .form .dropdown, .contract-new-apply-component .contract-input-component .form .dropdown, .contract-new-apply-component .contract-management .form .dropdown, .contract-new-apply-component .contract-new-apply-component .form .dropdown {
width: 100%; width: 100%;
margin-top: 7px; margin-top: 7px;
} }
.contract-input-component .form .savebtn, .contract-management .form .savebtn, .contract-new-apply-component .form .savebtn { .contract-input-component .contract-input-component .form .savebtn, .contract-input-component .contract-management .form .savebtn, .contract-input-component .contract-new-apply-component .form .savebtn, .contract-management .contract-input-component .form .savebtn, .contract-management .contract-management .form .savebtn, .contract-management .contract-new-apply-component .form .savebtn, .contract-new-apply-component .contract-input-component .form .savebtn, .contract-new-apply-component .contract-management .form .savebtn, .contract-new-apply-component .contract-new-apply-component .form .savebtn {
margin-right: 13px; margin-right: 13px;
display: flex; display: flex;
justify-content: center; justify-content: center;
@ -557,11 +557,11 @@ main table td, main table th {
height: 45px; height: 45px;
font-size: 15px; font-size: 15px;
} }
.contract-input-component .form table .fixed, .contract-management .form table .fixed, .contract-new-apply-component .form table .fixed { .contract-input-component .contract-input-component .form table .fixed, .contract-input-component .contract-management .form table .fixed, .contract-input-component .contract-new-apply-component .form table .fixed, .contract-management .contract-input-component .form table .fixed, .contract-management .contract-management .form table .fixed, .contract-management .contract-new-apply-component .form table .fixed, .contract-new-apply-component .contract-input-component .form table .fixed, .contract-new-apply-component .contract-management .form table .fixed, .contract-new-apply-component .contract-new-apply-component .form table .fixed {
padding: 8px 0; padding: 8px 0;
cursor: not-allowed; cursor: not-allowed;
} }
.contract-input-component .form table .alerttext, .contract-management .form table .alerttext, .contract-new-apply-component .form table .alerttext { .contract-input-component .contract-input-component .form table .alerttext, .contract-input-component .contract-management .form table .alerttext, .contract-input-component .contract-new-apply-component .form table .alerttext, .contract-management .contract-input-component .form table .alerttext, .contract-management .contract-management .form table .alerttext, .contract-management .contract-new-apply-component .form table .alerttext, .contract-new-apply-component .contract-input-component .form table .alerttext, .contract-new-apply-component .contract-management .form table .alerttext, .contract-new-apply-component .contract-new-apply-component .form table .alerttext {
font-size: 13px; font-size: 13px;
color: #a00; color: #a00;
font-weight: 500; font-weight: 500;
@ -569,86 +569,92 @@ main table td, main table th {
font-weight: 900; font-weight: 900;
padding: 0; padding: 0;
} }
.contract-input-component .form input[type=file], .contract-management .form input[type=file], .contract-new-apply-component .form input[type=file] { .contract-input-component .contract-input-component .form input[type=file], .contract-input-component .contract-management .form input[type=file], .contract-input-component .contract-new-apply-component .form input[type=file], .contract-management .contract-input-component .form input[type=file], .contract-management .contract-management .form input[type=file], .contract-management .contract-new-apply-component .form input[type=file], .contract-new-apply-component .contract-input-component .form input[type=file], .contract-new-apply-component .contract-management .form input[type=file], .contract-new-apply-component .contract-new-apply-component .form input[type=file] {
padding: 12px 20px; padding: 12px 20px;
margin: 8px 0; margin: 8px 0;
} }
.contract-input-component .form span, .contract-management .form span, .contract-new-apply-component .form span { .contract-input-component .contract-input-component .form span, .contract-input-component .contract-management .form span, .contract-input-component .contract-new-apply-component .form span, .contract-management .contract-input-component .form span, .contract-management .contract-management .form span, .contract-management .contract-new-apply-component .form span, .contract-new-apply-component .contract-input-component .form span, .contract-new-apply-component .contract-management .form span, .contract-new-apply-component .contract-new-apply-component .form span {
font-weight: 900; font-weight: 900;
} }
.contract-input-component .form span.successtext, .contract-management .form span.successtext, .contract-new-apply-component .form span.successtext { .contract-input-component .contract-input-component .form span.successtext, .contract-input-component .contract-management .form span.successtext, .contract-input-component .contract-new-apply-component .form span.successtext, .contract-management .contract-input-component .form span.successtext, .contract-management .contract-management .form span.successtext, .contract-management .contract-new-apply-component .form span.successtext, .contract-new-apply-component .contract-input-component .form span.successtext, .contract-new-apply-component .contract-management .form span.successtext, .contract-new-apply-component .contract-new-apply-component .form span.successtext {
color: #0a0; color: #0a0;
} }
.contract-input-component .form span.failtext, .contract-management .form span.failtext, .contract-new-apply-component .form span.failtext { .contract-input-component .contract-input-component .form span.failtext, .contract-input-component .contract-management .form span.failtext, .contract-input-component .contract-new-apply-component .form span.failtext, .contract-management .contract-input-component .form span.failtext, .contract-management .contract-management .form span.failtext, .contract-management .contract-new-apply-component .form span.failtext, .contract-new-apply-component .contract-input-component .form span.failtext, .contract-new-apply-component .contract-management .form span.failtext, .contract-new-apply-component .contract-new-apply-component .form span.failtext {
color: #a00; color: #a00;
} }
.contract-input-component .form span.readtext, .contract-management .form span.readtext, .contract-new-apply-component .form span.readtext { .contract-input-component .contract-input-component .form span.readtext, .contract-input-component .contract-management .form span.readtext, .contract-input-component .contract-new-apply-component .form span.readtext, .contract-management .contract-input-component .form span.readtext, .contract-management .contract-management .form span.readtext, .contract-management .contract-new-apply-component .form span.readtext, .contract-new-apply-component .contract-input-component .form span.readtext, .contract-new-apply-component .contract-management .form span.readtext, .contract-new-apply-component .contract-new-apply-component .form span.readtext {
color: #aa0; color: #aa0;
} }
.contract-input-component .form input[type=number]::-webkit-outer-spin-button, .contract-input-component .contract-input-component .form input[type=number]::-webkit-outer-spin-button,
.contract-input-component .form input[type=number]::-webkit-inner-spin-button, .contract-management .form input[type=number]::-webkit-outer-spin-button, .contract-input-component .contract-input-component .form input[type=number]::-webkit-inner-spin-button, .contract-input-component .contract-management .form input[type=number]::-webkit-outer-spin-button,
.contract-management .form input[type=number]::-webkit-inner-spin-button, .contract-new-apply-component .form input[type=number]::-webkit-outer-spin-button, .contract-input-component .contract-management .form input[type=number]::-webkit-inner-spin-button, .contract-input-component .contract-new-apply-component .form input[type=number]::-webkit-outer-spin-button,
.contract-new-apply-component .form input[type=number]::-webkit-inner-spin-button { .contract-input-component .contract-new-apply-component .form input[type=number]::-webkit-inner-spin-button, .contract-management .contract-input-component .form input[type=number]::-webkit-outer-spin-button,
.contract-management .contract-input-component .form input[type=number]::-webkit-inner-spin-button, .contract-management .contract-management .form input[type=number]::-webkit-outer-spin-button,
.contract-management .contract-management .form input[type=number]::-webkit-inner-spin-button, .contract-management .contract-new-apply-component .form input[type=number]::-webkit-outer-spin-button,
.contract-management .contract-new-apply-component .form input[type=number]::-webkit-inner-spin-button, .contract-new-apply-component .contract-input-component .form input[type=number]::-webkit-outer-spin-button,
.contract-new-apply-component .contract-input-component .form input[type=number]::-webkit-inner-spin-button, .contract-new-apply-component .contract-management .form input[type=number]::-webkit-outer-spin-button,
.contract-new-apply-component .contract-management .form input[type=number]::-webkit-inner-spin-button, .contract-new-apply-component .contract-new-apply-component .form input[type=number]::-webkit-outer-spin-button,
.contract-new-apply-component .contract-new-apply-component .form input[type=number]::-webkit-inner-spin-button {
-webkit-appearance: none; -webkit-appearance: none;
margin: 0; margin: 0;
} }
.contract-input-component .form input[type=number], .contract-management .form input[type=number], .contract-new-apply-component .form input[type=number] { .contract-input-component .contract-input-component .form input[type=number], .contract-input-component .contract-management .form input[type=number], .contract-input-component .contract-new-apply-component .form input[type=number], .contract-management .contract-input-component .form input[type=number], .contract-management .contract-management .form input[type=number], .contract-management .contract-new-apply-component .form input[type=number], .contract-new-apply-component .contract-input-component .form input[type=number], .contract-new-apply-component .contract-management .form input[type=number], .contract-new-apply-component .contract-new-apply-component .form input[type=number] {
-moz-appearance: textfield; -moz-appearance: textfield;
} }
.contract-input-component .error, .contract-management .error, .contract-new-apply-component .error { .contract-input-component .contract-input-component .error, .contract-input-component .contract-management .error, .contract-input-component .contract-new-apply-component .error, .contract-management .contract-input-component .error, .contract-management .contract-management .error, .contract-management .contract-new-apply-component .error, .contract-new-apply-component .contract-input-component .error, .contract-new-apply-component .contract-management .error, .contract-new-apply-component .contract-new-apply-component .error {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 15px; margin: 15px;
} }
.contract-input-component .error .errortext, .contract-management .error .errortext, .contract-new-apply-component .error .errortext { .contract-input-component .contract-input-component .error .errortext, .contract-input-component .contract-management .error .errortext, .contract-input-component .contract-new-apply-component .error .errortext, .contract-management .contract-input-component .error .errortext, .contract-management .contract-management .error .errortext, .contract-management .contract-new-apply-component .error .errortext, .contract-new-apply-component .contract-input-component .error .errortext, .contract-new-apply-component .contract-management .error .errortext, .contract-new-apply-component .contract-new-apply-component .error .errortext {
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
color: #a00; color: #a00;
} }
.contract-input-component .input-group-btn, .contract-management .input-group-btn, .contract-new-apply-component .input-group-btn { .contract-input-component .contract-input-component .input-group-btn, .contract-input-component .contract-management .input-group-btn, .contract-input-component .contract-new-apply-component .input-group-btn, .contract-management .contract-input-component .input-group-btn, .contract-management .contract-management .input-group-btn, .contract-management .contract-new-apply-component .input-group-btn, .contract-new-apply-component .contract-input-component .input-group-btn, .contract-new-apply-component .contract-management .input-group-btn, .contract-new-apply-component .contract-new-apply-component .input-group-btn {
font-size: 16px; font-size: 16px;
} }
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
.contract-input-component table, .contract-management table, .contract-new-apply-component table { .contract-input-component .contract-input-component table, .contract-input-component .contract-management table, .contract-input-component .contract-new-apply-component table, .contract-management .contract-input-component table, .contract-management .contract-management table, .contract-management .contract-new-apply-component table, .contract-new-apply-component .contract-input-component table, .contract-new-apply-component .contract-management table, .contract-new-apply-component .contract-new-apply-component table {
border: 0; border: 0;
} }
.contract-input-component table thead, .contract-management table thead, .contract-new-apply-component table thead { .contract-input-component .contract-input-component table thead, .contract-input-component .contract-management table thead, .contract-input-component .contract-new-apply-component table thead, .contract-management .contract-input-component table thead, .contract-management .contract-management table thead, .contract-management .contract-new-apply-component table thead, .contract-new-apply-component .contract-input-component table thead, .contract-new-apply-component .contract-management table thead, .contract-new-apply-component .contract-new-apply-component table thead {
display: none; display: none;
} }
.contract-input-component table tr, .contract-management table tr, .contract-new-apply-component table tr { .contract-input-component .contract-input-component table tr, .contract-input-component .contract-management table tr, .contract-input-component .contract-new-apply-component table tr, .contract-management .contract-input-component table tr, .contract-management .contract-management table tr, .contract-management .contract-new-apply-component table tr, .contract-new-apply-component .contract-input-component table tr, .contract-new-apply-component .contract-management table tr, .contract-new-apply-component .contract-new-apply-component table tr {
margin-bottom: 10px; margin-bottom: 10px;
display: block; display: block;
border-bottom: 2px solid #ddd; border-bottom: 2px solid #ddd;
} }
.contract-input-component table td, .contract-management table td, .contract-new-apply-component table td { .contract-input-component .contract-input-component table td, .contract-input-component .contract-management table td, .contract-input-component .contract-new-apply-component table td, .contract-management .contract-input-component table td, .contract-management .contract-management table td, .contract-management .contract-new-apply-component table td, .contract-new-apply-component .contract-input-component table td, .contract-new-apply-component .contract-management table td, .contract-new-apply-component .contract-new-apply-component table td {
display: block; display: block;
text-align: left; text-align: left;
font-size: 14px; font-size: 14px;
border-bottom: 1px dotted #ccc; border-bottom: 1px dotted #ccc;
} }
.contract-input-component table td:last-child, .contract-management table td:last-child, .contract-new-apply-component table td:last-child { .contract-input-component .contract-input-component table td:last-child, .contract-input-component .contract-management table td:last-child, .contract-input-component .contract-new-apply-component table td:last-child, .contract-management .contract-input-component table td:last-child, .contract-management .contract-management table td:last-child, .contract-management .contract-new-apply-component table td:last-child, .contract-new-apply-component .contract-input-component table td:last-child, .contract-new-apply-component .contract-management table td:last-child, .contract-new-apply-component .contract-new-apply-component table td:last-child {
border-bottom: 0; border-bottom: 0;
} }
.contract-input-component table td:before, .contract-management table td:before, .contract-new-apply-component table td:before { .contract-input-component .contract-input-component table td:before, .contract-input-component .contract-management table td:before, .contract-input-component .contract-new-apply-component table td:before, .contract-management .contract-input-component table td:before, .contract-management .contract-management table td:before, .contract-management .contract-new-apply-component table td:before, .contract-new-apply-component .contract-input-component table td:before, .contract-new-apply-component .contract-management table td:before, .contract-new-apply-component .contract-new-apply-component table td:before {
content: attr(data-label); content: attr(data-label);
float: left; float: left;
text-transform: uppercase; text-transform: uppercase;
font-weight: bold; font-weight: bold;
} }
} }
.contract-input-component .images, .contract-management .images, .contract-new-apply-component .images { .contract-input-component .contract-input-component .images, .contract-input-component .contract-management .images, .contract-input-component .contract-new-apply-component .images, .contract-management .contract-input-component .images, .contract-management .contract-management .images, .contract-management .contract-new-apply-component .images, .contract-new-apply-component .contract-input-component .images, .contract-new-apply-component .contract-management .images, .contract-new-apply-component .contract-new-apply-component .images {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
padding: 20px; padding: 20px;
} }
.contract-input-component .images > .image, .contract-management .images > .image, .contract-new-apply-component .images > .image { .contract-input-component .contract-input-component .images > .image, .contract-input-component .contract-management .images > .image, .contract-input-component .contract-new-apply-component .images > .image, .contract-management .contract-input-component .images > .image, .contract-management .contract-management .images > .image, .contract-management .contract-new-apply-component .images > .image, .contract-new-apply-component .contract-input-component .images > .image, .contract-new-apply-component .contract-management .images > .image, .contract-new-apply-component .contract-new-apply-component .images > .image {
position: relative; position: relative;
margin: 10px; margin: 10px;
} }
.contract-input-component .images > .image:hover > i, .contract-management .images > .image:hover > i, .contract-new-apply-component .images > .image:hover > i { .contract-input-component .contract-input-component .images > .image:hover > i, .contract-input-component .contract-management .images > .image:hover > i, .contract-input-component .contract-new-apply-component .images > .image:hover > i, .contract-management .contract-input-component .images > .image:hover > i, .contract-management .contract-management .images > .image:hover > i, .contract-management .contract-new-apply-component .images > .image:hover > i, .contract-new-apply-component .contract-input-component .images > .image:hover > i, .contract-new-apply-component .contract-management .images > .image:hover > i, .contract-new-apply-component .contract-new-apply-component .images > .image:hover > i {
opacity: 1; opacity: 1;
} }
.contract-input-component .images > .image > i, .contract-management .images > .image > i, .contract-new-apply-component .images > .image > i { .contract-input-component .contract-input-component .images > .image > i, .contract-input-component .contract-management .images > .image > i, .contract-input-component .contract-new-apply-component .images > .image > i, .contract-management .contract-input-component .images > .image > i, .contract-management .contract-management .images > .image > i, .contract-management .contract-new-apply-component .images > .image > i, .contract-new-apply-component .contract-input-component .images > .image > i, .contract-new-apply-component .contract-management .images > .image > i, .contract-new-apply-component .contract-new-apply-component .images > .image > i {
position: absolute; position: absolute;
top: -12px; top: -12px;
right: -12px; right: -12px;
@ -657,37 +663,29 @@ main table td, main table th {
opacity: 0; opacity: 0;
transition: 0.3s; transition: 0.3s;
} }
.contract-input-component table, .contract-management table, .contract-new-apply-component table {
table {
table-layout: fixed; table-layout: fixed;
width: 100%; width: 100%;
} }
.contract-input-component td, .contract-management td, .contract-new-apply-component td {
td {
word-wrap: break-word; word-wrap: break-word;
} }
.contract-input-component img, .contract-management img, .contract-new-apply-component img {
img {
width: 125px; width: 125px;
} }
.contract-input-component .width_style_1, .contract-management .width_style_1, .contract-new-apply-component .width_style_1 {
.width_style_1 {
width: 125px; width: 125px;
} }
.contract-input-component table, .contract-management table, .contract-new-apply-component table {
table {
width: 100%; width: 100%;
} }
.contract-input-component #table_index_filter, .contract-management #table_index_filter, .contract-new-apply-component #table_index_filter {
#table_index_filter {
float: right; float: right;
} }
.contract-input-component #table_index_paginate, .contract-management #table_index_paginate, .contract-new-apply-component #table_index_paginate {
#table_index_paginate {
float: right; float: right;
} }
.contract-input-component label, .contract-management label, .contract-new-apply-component label {
label {
display: inline-flex; display: inline-flex;
margin-bottom: 0.5rem; margin-bottom: 0.5rem;
margin-top: 0.5rem; margin-top: 0.5rem;

2
wms/contract/styles/style.css.map
View File

File diff suppressed because one or more lines are too long

2
wms/contract/styles/style.scss
View File

@ -562,6 +562,7 @@ main{
0% { transform: rotate(0deg); } 0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); } 100% { transform: rotate(360deg); }
} }
.contract-input-component, .contract-management, .contract-new-apply-component{
.contract-input-component, .contract-management, .contract-new-apply-component{ .contract-input-component, .contract-management, .contract-new-apply-component{
.form{ .form{
margin:0 auto; margin:0 auto;
@ -719,3 +720,4 @@ label {
margin-top: .5rem; margin-top: .5rem;
} }
}
Write Preview
Loading…
Cancel
Save