From 65b705e40eab1bae9da5584fd89c233049ce8d6b Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Sun, 1 Jun 2025 15:59:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=AE=A2=E5=8D=95=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/orders/Configorder.php   |  8 ++-
 .../admin/view/orders/configorder/edit.html   | 71 ++++++++++++++++++-
 2 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/application/admin/controller/orders/Configorder.php b/application/admin/controller/orders/Configorder.php
index 0a5cd83..c5b8cdd 100644
--- a/application/admin/controller/orders/Configorder.php
+++ b/application/admin/controller/orders/Configorder.php
@@ -4,6 +4,7 @@ namespace app\admin\controller\orders;
 
 use app\admin\model\Admin;
 use app\admin\model\Order;
+use app\admin\model\Worker;
 use app\common\controller\Backend;
 use think\Db;
 use think\Exception;
@@ -102,6 +103,8 @@ class Configorder extends Backend
         }
         if (false === $this->request->isPost()) {
             $this->view->assign('row', $row);
+            $workerRate = Worker::where('id',$row->worker_id)->value('rate');
+            $this->view->assign('rate', $workerRate);
             return $this->view->fetch();
         }
         $params = $this->request->post('row/a');
@@ -131,7 +134,10 @@ class Configorder extends Backend
                 'cost'              =>  $params['cost'],
                 'offline_amount_type'=> $params['offline_amount_type'],
                 'amount_images'     =>  $params['amount_images'],
-                'material_cost'     =>  $params['material_cost']
+                'material_cost'     =>  $params['material_cost'],
+                'cost_rate'         =>  $params['cost_rate'],
+                'cost_remark'       =>  $params['cost_remark'],
+                'material_images'            =>  $params['material_images'],
             ];
 
             $last_amount = bcadd($params['online_amount_last'],$params['offline_amount'],2);
diff --git a/application/admin/view/orders/configorder/edit.html b/application/admin/view/orders/configorder/edit.html
index 829ec79..2d823f1 100644
--- a/application/admin/view/orders/configorder/edit.html
+++ b/application/admin/view/orders/configorder/edit.html
@@ -90,6 +90,14 @@
             </div>
         </div>
 
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('师傅提点(%)')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-cost_rate" data-rule="required" name="row[cost_rate]" type="number" min="0" max="100" step="1" class="form-control" value="{$rate|htmlentities}">
+        </div>
+    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Cost')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -97,14 +105,41 @@
         </div>
     </div>
 
+
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Material_cost')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('分成备注')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-cost_remark" data-rule="required" name="row[cost_remark]" type="text" class="form-control" value="{$row.cost_remark}">
+        </div>
+    </div>
+
+
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('材料成本')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-material_cost" data-rule="required" class="form-control" step="0.01" name="row[material_cost]" type="number" value="{$row.dispatch.material_cost|htmlentities}">
         </div>
     </div>
 
 
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('材料凭证')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-material_images" class="form-control" size="50" value="{$row.material_images}" name="row[material_images]" type="text">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-material_images" class="btn btn-danger faupload" data-input-id="c-material_images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-material_images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-material_images" class="btn btn-primary fachoose" data-input-id="c-material_images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-material_images"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-material_images"></ul>
+        </div>
+    </div>
+
+
+
 
 
     {/if}
@@ -151,6 +186,15 @@
 
 
 
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('师傅提点(%)')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-cost_rate" data-rule="required" name="row[cost_rate]" type="number" min="0" max="100" step="1" class="form-control" value="{$row.cost_rate|htmlentities}">
+        </div>
+    </div>
+
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Cost')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -159,6 +203,15 @@
     </div>
 
 
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('分成备注')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-cost_remark" data-rule="required" name="row[cost_remark]" type="text" class="form-control" value="{$row.cost_remark}">
+        </div>
+    </div>
+
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('材料成本')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -166,6 +219,22 @@
         </div>
     </div>
 
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('材料凭证')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="input-group">
+                <input id="c-material_images" class="form-control" size="50" value="{$row.material_images}" name="row[material_images]" type="text">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-material_images" class="btn btn-danger faupload" data-input-id="c-material_images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple="true" data-preview-id="p-material_images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-material_images" class="btn btn-primary fachoose" data-input-id="c-material_images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-material_images"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-material_images"></ul>
+        </div>
+    </div>
+
     {/if}