From 50581f75c8d392b17c79bc6f8550ec2b59e144dc Mon Sep 17 00:00:00 2001
From: travis <310243791@qq.com>
Date: Sat, 7 Dec 2019 16:53:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E5=95=86=E5=93=81js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/modules/shop/views/order/_form.php    | 18 +----
 .../shop/views/order/delivery_goods.php       | 69 ++++++++++---------
 2 files changed, 39 insertions(+), 48 deletions(-)

diff --git a/backend/modules/shop/views/order/_form.php b/backend/modules/shop/views/order/_form.php
index 881787b..a630ef8 100755
--- a/backend/modules/shop/views/order/_form.php
+++ b/backend/modules/shop/views/order/_form.php
@@ -12,18 +12,8 @@ use yii\widgets\ActiveForm;
 
     <?php $form = ActiveForm::begin(); ?>
 
-    <?= $form->field($model, 'user_id')->textInput() ?>
-
-    <?= $form->field($model, 'order_sn')->textInput(['maxlength' => true]) ?>
-
     <?= $form->field($model, 'invoice_id')->textInput(['maxlength' => true]) ?>
 
-    <?= $form->field($model, 'status')->textInput() ?>
-
-    <?= $form->field($model, 'type')->textInput() ?>
-
-    <?= $form->field($model, 'goods_count')->textInput() ?>
-
     <?= $form->field($model, 'goods_amount')->textInput() ?>
 
     <?= $form->field($model, 'shipping_amount')->textInput() ?>
@@ -42,12 +32,6 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'taking_site')->textInput() ?>
 
-    <?= $form->field($model, 'pay_type')->textInput() ?>
-
-    <?= $form->field($model, 'pay_at')->textInput() ?>
-
-    <?= $form->field($model, 'payment_sn')->textInput(['maxlength' => true]) ?>
-
     <?= $form->field($model, 'payment_amount')->textInput() ?>
 
     <?= $form->field($model, 'receivables')->textInput() ?>
@@ -56,7 +40,7 @@ use yii\widgets\ActiveForm;
 
     <?= $form->field($model, 'discount_amount')->textInput() ?>
 
-    <?= $form->field($model, 'discount_decription')->textarea(['rows' => 6]) ?>
+    <?= $form->field($model, 'discount_description')->textarea(['rows' => 6]) ?>
 
     <div class="form-group">
         <?= Html::submitButton('保存', ['class' => 'btn btn-success']) ?>
diff --git a/backend/modules/shop/views/order/delivery_goods.php b/backend/modules/shop/views/order/delivery_goods.php
index fd710b2..11a0a95 100644
--- a/backend/modules/shop/views/order/delivery_goods.php
+++ b/backend/modules/shop/views/order/delivery_goods.php
@@ -41,7 +41,7 @@
 <?php
 $js = <<<SCRIPT
 //初始化订单商品数据
-  var data = $deliveryGoods ;
+  var data = $deliveryGoods;
   console.log(data);
   var unShipped = {};
   function init() {
@@ -54,8 +54,37 @@ $js = <<<SCRIPT
     unShipped = JSON.stringify(unShipped);
     $('#deliveryGoods').val(unShipped)
   }
-
   init();
+  
+  //编辑发货数量
+  function updateGoods(ref){
+    ref = $(ref)[0].target;
+    $(ref).hide();
+    $(ref).next().show();
+    $(ref).parent().parent().find('.goods_count').removeAttr('disabled')
+  }
+  
+  //保存编辑
+  function saveGoods(ref) {
+    if(typeof unShipped =='string'){
+      unShipped = JSON.parse(unShipped)
+    }
+    ref = $(ref)[0].target;
+    var tr = $(ref).parent().parent();
+    tr.find('.goods_count').attr('disabled','disabled');
+    var index = tr.attr('data-index');
+    var number = tr.find('.goods_count').val();
+    if (number < 0) {
+      alert('发货数量不能低于0');
+      tr.find('.goods_count').val(0);
+      return false;
+    }
+    unShipped[index].goods_count = number;
+    unShipped = JSON.stringify(unShipped);
+    $('#deliveryGoods').val(unShipped);
+    $(ref).hide();
+    $(ref).prev().show();
+  }
 
   //显示未发货商品
   function showUnShipped(unShipped) {
@@ -66,8 +95,8 @@ $js = <<<SCRIPT
         "<td class='lack_number'>" + item.lack_number + "</td>" +
         "<td><input type='text' class='goods_count' value='"+item.lack_number+"' disabled/></td>" +
         "<td>" +
-        "<input type='button' class='btn btn-primary' value='编辑' onclick='updateGoods(this)'/>" +
-        "<input type='button' class='btn btn-primary' value='保存' onclick='saveGoods(this)' style='display: none' />" +
+        "<input type='button' class='btn btn-primary btn-update' value='编辑'/>" +
+        "<input type='button' class='btn btn-primary btn-save' value='保存' style='display: none' />" +
         "</td>" +
         "</tr>";
       $('.unShipped-table').append(tr)
@@ -100,35 +129,13 @@ $js = <<<SCRIPT
     })
   }
 
-  //编辑发货数量
-  function updateGoods(ref){
-    $(ref).hide();
-    $(ref).next().show();
-    $(ref).parent().parent().find('.goods_count').removeAttr('disabled')
-  }
-
-  //保存编辑
-  function saveGoods(ref) {
-    if(typeof unShipped =='string'){
-      unShipped = JSON.parse(unShipped)
-    }
-    var tr = $(ref).parent().parent();
-    tr.find('.goods_count').attr('disabled','disabled');
-    var index = tr.attr('data-index');
-    var number = tr.find('.goods_count').val();
-    if (number < 0) {
-      alert('发货数量不能低于0');
-      tr.find('.goods_count').val(0);
-      return false;
-    }
-    unShipped[index].goods_count = number;
-    unShipped = JSON.stringify(unShipped);
-    $('#deliveryGoods').val(unShipped);
-    $(ref).hide();
-    $(ref).prev().show();
+  var btnUpdate = $('.btn-update');
+  var btnSave = $('.btn-save');
+  for (i = 0; i < btnUpdate.length; i++) {
+    btnUpdate[i].addEventListener("click", updateGoods);
+    btnSave[i].addEventListener("click", saveGoods);
   }
 SCRIPT;
-
 $this->registerJs($js);
 ?>