1221

wms/contract/contract-download.php

@@ -144,7 +144,7 @@ if(isset($_GET['id']) && $_GET['id']!=""){
             非制式合約
         </label> -->
     </div>
-    <button @click="isBuyInputIng = true" class="rebtn">重新輸入</button>
+    <!-- <button @click="isBuyInputIng = true" class="rebtn">重新輸入</button> -->
     <button @click="exportFn(1)" class="prviewbtn">預覽</button>
     <div class="contract" id="noStandardBuyContract" x-show="!toggleBuyStandard">
         <table class="my-2 contract" x-ref="contract1" id="contract1">
@@ -270,7 +270,7 @@ if(isset($_GET['id']) && $_GET['id']!=""){
             非制式合約
         </label> -->
     </div>
-    <button @click="isInstallInputIng = true" class="rebtn">重新輸入</button>
+    <!-- <button @click="isInstallInputIng = true" class="rebtn">重新輸入</button> -->
     <button @click="exportFn(2)" class="prviewbtn">預覽</button>
     
     

wms/contract/contract-new-apply.php

@@ -92,7 +92,7 @@ if(empty($contract_new_apply)){
     }
 
     $sql_str = "SELECT file_name FROM contract_apply_files WHERE contract_id = :contract_id AND deleted_at IS NULL";
-    $sql_str = "SELECT contract_apply_files.file_name, contract_apply_files.id as id FROM contract_new_apply LEFT JOIN contract_apply_files ON contract_new_apply.id = contract_apply_files.contract_id WHERE contract_new_apply.mid = :contract_id AND contract_apply_files.deleted_at IS NULL";
+    $sql_str = "SELECT contract_apply_files.file_name, contract_apply_files.id as id FROM contract_new_apply JOIN contract_apply_files ON contract_new_apply.id = contract_apply_files.contract_id WHERE contract_new_apply.mid = :contract_id AND contract_apply_files.deleted_at IS NULL";
     $stmt = $conn->prepare($sql_str);
     $stmt->bindParam(':contract_id', $id);
     $stmt->execute();
@@ -460,11 +460,13 @@ $person = $contract['person'];
                             <input type="file" name="file[]" multiple draggable="true" @change="uploadFiles($event)" />
                             <?php endif; ?>
                             <template x-for="file in data.originfiles">
+                                <template x-if="file">
                                     <div>
                                         <a :href="'./images/contracts_new_files/' + file.file_name" download x-text="file.file_name" ></a>
                                         <span @click="removeFile(file.id)" style="margin-left:10px;cursor:pointer;color:#f019">X</span>
                                     </div>
                                 </template>
+                            </template>
                            
                         </td>
                     </tr>

wms/mkt/pricereview-create.php

@@ -2113,6 +2113,10 @@ if (count($last_pritem_arr) > 0 && isset($last_pritem_arr["B"])) {
             <label for="special_fee">特殊費用</label>
             <input type="text" name="special_fee" id="special_fee" value="<?php if (isset($last_pr_arr["special_fee"])) echo number_format($last_pr_arr["special_fee"]); ?>">
         </div>
+        <div>
+            <label for="special_fee">服務費</label>
+            <input type="text" name="service_fee" id="service_fee" value="0">
+        </div>
         <div>
             <label for="price_broken">破價(台)</label>
             <input type="text" name="price_broken" id="price_broken" class="dollar-right" value="<?php if (isset($last_pr_arr["qty_total"]) && $last_pr_arr["qty_total"]>0) {