Просмотр исходного кода

合同支付,控制上下移按钮

MaiXinRong 6 лет назад
Родитель
Сommit
b56504214a
2 измененных файлов с 6 добавлено и 5 удалено
  1. 4 4
      app/public/js/stage_pay.js
  2. 2 1
      app/service/stage_pay.js

+ 4 - 4
app/public/js/stage_pay.js

@@ -126,8 +126,8 @@ $(document).ready(() => {
             const select = SpreadJsObj.getSelectObject(sheet);
             setObjEnable($('#add'), !readOnly);
             setObjEnable($('#del'), !readOnly && select);
-            setObjEnable($('#up-move'), !readOnly && select && dealPay.indexOf(select) > 0);
-            setObjEnable($('#down-move'), !readOnly && select && dealPay.indexOf(select) < dealPay.length - 1);
+            setObjEnable($('#up-move'), !readOnly && select && select.ptype === 1 && dealPay.indexOf(select) > 3);
+            setObjEnable($('#down-move'), !readOnly && select && select.ptype === 1 && dealPay.indexOf(select) < dealPay.length - 1);
             setObjEnable($('#unlock'), !readOnly);
         },
         add: function () {
@@ -160,7 +160,7 @@ $(document).ready(() => {
             const sheet = paySpread.getActiveSheet();
             const cur = SpreadJsObj.getSelectObject(sheet);
             const up = dealPay[dealPay.indexOf(cur) - 1];
-            postData(window.location.pathname + '/save', {type: 'changeOrder', id1: cur.id, id2: up.id}, function () {
+            postData(window.location.pathname + '/save', {type: 'changeOrder', id1: cur.pid, id2: up.pid}, function () {
                 const order = cur.order;
                 cur.order = up.order;
                 up.order = order;
@@ -176,7 +176,7 @@ $(document).ready(() => {
             const sheet = paySpread.getActiveSheet();
             const cur = SpreadJsObj.getSelectObject(sheet);
             const down = dealPay[dealPay.indexOf(cur) + 1];
-            postData(window.location.pathname + '/save', {type: 'changeOrder', id1: cur.id, id2: down.id}, function () {
+            postData(window.location.pathname + '/save', {type: 'changeOrder', id1: cur.pid, id2: down.pid}, function () {
                 const order = cur.order;
                 cur.order = down.order;
                 down.order = order;

+ 2 - 1
app/service/stage_pay.js

@@ -49,7 +49,8 @@ module.exports = app => {
          * @returns {Promise<*>}
          */
         async getAuditorStageData(sid, times, order) {
-            const sql = 'SELECT SP.*, P.`csorder`, P.`cstimes`, P.`csaorder`, P.`order`, P.uid, P.name, P.minus, P.ptype, P.sprice, P.sexpr, P.rprice, P.rexpr, P.is_yf, P.dl_type, P.dl_count, P.dl_tp_type, P.dl_tp ' +
+            const sql = 'SELECT SP.*,' +
+                '    P.`csorder`, P.`cstimes`, P.`csaorder`, P.`order`, P.uid, P.name, P.minus, P.ptype, P.sprice, P.sexpr, P.rprice, P.rexpr, P.is_yf, P.dl_type, P.dl_count, P.dl_tp_type, P.dl_tp ' +
                 '  FROM ?? As SP, ?? As P ' +
                 '  WHERE SP.`sid` = ? AND SP.`stimes` = ? AND SP.`sorder` = ? AND SP.`pid` = P.`id` AND P.`valid`' +
                 '  ORDER BY P.`order`';