Skip to content

C
cg_approveApp_2023
Commit a143acc5 authored by 黎活宝's avatar 黎活宝
Browse files
Options

230621

parent 42680539
Pipeline #49 failed with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 708 additions and 209 deletions
      package-lock.json
      View file @ a143acc5
      ...@@ -1420,6 +1420,62 @@ ...@@ -1420,6 +1420,62 @@
      } }
      } }
      }, },
      "babel-core": {
      "version": "6.26.3",
      "resolved": "https://registry.npmmirror.com/babel-core/-/babel-core-6.26.3.tgz",
      "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==",
      "dev": true,
      "requires": {
      "babel-code-frame": "^6.26.0",
      "babel-generator": "^6.26.0",
      "babel-helpers": "^6.24.1",
      "babel-messages": "^6.23.0",
      "babel-register": "^6.26.0",
      "babel-runtime": "^6.26.0",
      "babel-template": "^6.26.0",
      "babel-traverse": "^6.26.0",
      "babel-types": "^6.26.0",
      "babylon": "^6.18.0",
      "convert-source-map": "^1.5.1",
      "debug": "^2.6.9",
      "json5": "^0.5.1",
      "lodash": "^4.17.4",
      "minimatch": "^3.0.4",
      "path-is-absolute": "^1.0.1",
      "private": "^0.1.8",
      "slash": "^1.0.0",
      "source-map": "^0.5.7"
      },
      "dependencies": {
      "debug": {
      "version": "2.6.9",
      "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
      "dev": true,
      "requires": {
      "ms": "2.0.0"
      }
      },
      "json5": {
      "version": "0.5.1",
      "resolved": "https://registry.npmmirror.com/json5/-/json5-0.5.1.tgz",
      "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==",
      "dev": true
      },
      "ms": {
      "version": "2.0.0",
      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
      "dev": true
      },
      "slash": {
      "version": "1.0.0",
      "resolved": "https://registry.npmmirror.com/slash/-/slash-1.0.0.tgz",
      "integrity": "sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
      "dev": true
      }
      }
      },
      "babel-eslint": { "babel-eslint": {
      "version": "7.2.3", "version": "7.2.3",
      "resolved": "https://registry.npm.taobao.org/babel-eslint/download/babel-eslint-7.2.3.tgz", "resolved": "https://registry.npm.taobao.org/babel-eslint/download/babel-eslint-7.2.3.tgz",
      ...@@ -1432,6 +1488,40 @@ ...@@ -1432,6 +1488,40 @@
      "babylon": "^6.17.0" "babylon": "^6.17.0"
      } }
      }, },
      "babel-generator": {
      "version": "6.26.1",
      "resolved": "https://registry.npmmirror.com/babel-generator/-/babel-generator-6.26.1.tgz",
      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
      "dev": true,
      "requires": {
      "babel-messages": "^6.23.0",
      "babel-runtime": "^6.26.0",
      "babel-types": "^6.26.0",
      "detect-indent": "^4.0.0",
      "jsesc": "^1.3.0",
      "lodash": "^4.17.4",
      "source-map": "^0.5.7",
      "trim-right": "^1.0.1"
      },
      "dependencies": {
      "jsesc": {
      "version": "1.3.0",
      "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-1.3.0.tgz",
      "integrity": "sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA==",
      "dev": true
      }
      }
      },
      "babel-helpers": {
      "version": "6.24.1",
      "resolved": "https://registry.npmmirror.com/babel-helpers/-/babel-helpers-6.24.1.tgz",
      "integrity": "sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ==",
      "dev": true,
      "requires": {
      "babel-runtime": "^6.22.0",
      "babel-template": "^6.24.1"
      }
      },
      "babel-messages": { "babel-messages": {
      "version": "6.23.0", "version": "6.23.0",
      "resolved": "https://registry.npm.taobao.org/babel-messages/download/babel-messages-6.23.0.tgz", "resolved": "https://registry.npm.taobao.org/babel-messages/download/babel-messages-6.23.0.tgz",
      ...@@ -1450,6 +1540,21 @@ ...@@ -1450,6 +1540,21 @@
      "object.assign": "^4.1.0" "object.assign": "^4.1.0"
      } }
      }, },
      "babel-register": {
      "version": "6.26.0",
      "resolved": "https://registry.npmmirror.com/babel-register/-/babel-register-6.26.0.tgz",
      "integrity": "sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A==",
      "dev": true,
      "requires": {
      "babel-core": "^6.26.0",
      "babel-runtime": "^6.26.0",
      "core-js": "^2.5.0",
      "home-or-tmp": "^2.0.0",
      "lodash": "^4.17.4",
      "mkdirp": "^0.5.1",
      "source-map-support": "^0.4.15"
      }
      },
      "babel-runtime": { "babel-runtime": {
      "version": "6.26.0", "version": "6.26.0",
      "resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz", "resolved": "https://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz",
      ...@@ -1468,6 +1573,19 @@ ...@@ -1468,6 +1573,19 @@
      } }
      } }
      }, },
      "babel-template": {
      "version": "6.26.0",
      "resolved": "https://registry.npmmirror.com/babel-template/-/babel-template-6.26.0.tgz",
      "integrity": "sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==",
      "dev": true,
      "requires": {
      "babel-runtime": "^6.26.0",
      "babel-traverse": "^6.26.0",
      "babel-types": "^6.26.0",
      "babylon": "^6.18.0",
      "lodash": "^4.17.4"
      }
      },
      "babel-traverse": { "babel-traverse": {
      "version": "6.26.0", "version": "6.26.0",
      "resolved": "https://registry.npm.taobao.org/babel-traverse/download/babel-traverse-6.26.0.tgz", "resolved": "https://registry.npm.taobao.org/babel-traverse/download/babel-traverse-6.26.0.tgz",
      ...@@ -2205,6 +2323,11 @@ ...@@ -2205,6 +2323,11 @@
      "which": "^1.2.9" "which": "^1.2.9"
      } }
      }, },
      "crypto-js": {
      "version": "4.1.1",
      "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz",
      "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="
      },
      "css": { "css": {
      "version": "2.2.4", "version": "2.2.4",
      "resolved": "https://registry.npm.taobao.org/css/download/css-2.2.4.tgz", "resolved": "https://registry.npm.taobao.org/css/download/css-2.2.4.tgz",
      ...@@ -2481,6 +2604,15 @@ ...@@ -2481,6 +2604,15 @@
      "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
      "dev": true "dev": true
      }, },
      "detect-indent": {
      "version": "4.0.0",
      "resolved": "https://registry.npmmirror.com/detect-indent/-/detect-indent-4.0.0.tgz",
      "integrity": "sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A==",
      "dev": true,
      "requires": {
      "repeating": "^2.0.0"
      }
      },
      "doctrine": { "doctrine": {
      "version": "2.1.0", "version": "2.1.0",
      "resolved": "https://registry.npm.taobao.org/doctrine/download/doctrine-2.1.0.tgz", "resolved": "https://registry.npm.taobao.org/doctrine/download/doctrine-2.1.0.tgz",
      ...@@ -3809,6 +3941,16 @@ ...@@ -3809,6 +3941,16 @@
      "integrity": "sha1-hK5l+n6vsWX922FWauFLrwVmTw8=", "integrity": "sha1-hK5l+n6vsWX922FWauFLrwVmTw8=",
      "dev": true "dev": true
      }, },
      "home-or-tmp": {
      "version": "2.0.0",
      "resolved": "https://registry.npmmirror.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz",
      "integrity": "sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg==",
      "dev": true,
      "requires": {
      "os-homedir": "^1.0.0",
      "os-tmpdir": "^1.0.1"
      }
      },
      "htmlhint": { "htmlhint": {
      "version": "0.11.0", "version": "0.11.0",
      "resolved": "https://registry.npm.taobao.org/htmlhint/download/htmlhint-0.11.0.tgz", "resolved": "https://registry.npm.taobao.org/htmlhint/download/htmlhint-0.11.0.tgz",
      ...@@ -5278,6 +5420,12 @@ ...@@ -5278,6 +5420,12 @@
      "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=",
      "dev": true "dev": true
      }, },
      "private": {
      "version": "0.1.8",
      "resolved": "https://registry.npmmirror.com/private/-/private-0.1.8.tgz",
      "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
      "dev": true
      },
      "process-nextick-args": { "process-nextick-args": {
      "version": "2.0.1", "version": "2.0.1",
      "resolved": "https://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.1.tgz", "resolved": "https://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.1.tgz",
      ...@@ -5800,6 +5948,15 @@ ...@@ -5800,6 +5948,15 @@
      "urix": "^0.1.0" "urix": "^0.1.0"
      } }
      }, },
      "source-map-support": {
      "version": "0.4.18",
      "resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.4.18.tgz",
      "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==",
      "dev": true,
      "requires": {
      "source-map": "^0.5.6"
      }
      },
      "source-map-url": { "source-map-url": {
      "version": "0.4.0", "version": "0.4.0",
      "resolved": "https://registry.npm.taobao.org/source-map-url/download/source-map-url-0.4.0.tgz", "resolved": "https://registry.npm.taobao.org/source-map-url/download/source-map-url-0.4.0.tgz",
      ...@@ -6189,6 +6346,12 @@ ...@@ -6189,6 +6346,12 @@
      "escape-string-regexp": "^1.0.2" "escape-string-regexp": "^1.0.2"
      } }
      }, },
      "trim-right": {
      "version": "1.0.1",
      "resolved": "https://registry.npmmirror.com/trim-right/-/trim-right-1.0.1.tgz",
      "integrity": "sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==",
      "dev": true
      },
      "tslib": { "tslib": {
      "version": "1.14.0", "version": "1.14.0",
      "resolved": "https://registry.npm.taobao.org/tslib/download/tslib-1.14.0.tgz?cache=0&sync_timestamp=1601998793819&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-1.14.0.tgz", "resolved": "https://registry.npm.taobao.org/tslib/download/tslib-1.14.0.tgz?cache=0&sync_timestamp=1601998793819&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftslib%2Fdownload%2Ftslib-1.14.0.tgz",
      ...@@ -6569,6 +6732,26 @@ ...@@ -6569,6 +6732,26 @@
      } }
      } }
      }, },
      "wepy": {
      "version": "1.7.2",
      "resolved": "https://registry.npmmirror.com/wepy/-/wepy-1.7.2.tgz",
      "integrity": "sha512-22Q338OY2wV1kuINAtQQmO6V9r00wNTgLPOOOASZe8tdq0lGxv9FnFWxA7SqJihQJEeWXERFd/gN7GKQQ1CU1w=="
      },
      "wepy-compiler-babel": {
      "version": "1.5.3",
      "resolved": "https://registry.npmmirror.com/wepy-compiler-babel/-/wepy-compiler-babel-1.5.3.tgz",
      "integrity": "sha512-eFRH7IuebzKso5b3+zzo1K0FwXGVKLGfs3tYL9O0Vmf0NdIFL14iWBQAKOHWlnZJnxgH6JNzYtjUZqwcpj9XHg==",
      "dev": true,
      "requires": {
      "babel-core": "^6.20.0"
      }
      },
      "wepy-compiler-less": {
      "version": "1.3.14",
      "resolved": "https://registry.npmmirror.com/wepy-compiler-less/-/wepy-compiler-less-1.3.14.tgz",
      "integrity": "sha512-70n7Rb0i987RBun9EC+aTBHsscwSb6Vb4r7l+dgOy2KGyyvPvmhh2vSQduxFnhJzHuYRYMV+hxH51Jss+jE+vg==",
      "dev": true
      },
      "wepy-eslint": { "wepy-eslint": {
      "version": "1.5.4", "version": "1.5.4",
      "resolved": "https://registry.npm.taobao.org/wepy-eslint/download/wepy-eslint-1.5.4.tgz", "resolved": "https://registry.npm.taobao.org/wepy-eslint/download/wepy-eslint-1.5.4.tgz",
      ......
      package.json
      View file @ a143acc5
      { {
      "name": "mpshaodai", "name": "mpshaodai",
      "version": "0.0.2", "version": "0.0.2",
      "description": "A WePY project", "description": "A WePY project",
      ...@@ -19,13 +19,17 @@ ...@@ -19,13 +19,17 @@
      "@vant/weapp": "^1.5.1", "@vant/weapp": "^1.5.1",
      "@wepy/core": "^2.0.0-alpha.16", "@wepy/core": "^2.0.0-alpha.16",
      "@wepy/x": "^2.0.2", "@wepy/x": "^2.0.2",
      "miniprogram-slide-view": "0.0.3" "crypto-js": "^4.1.1",
      "miniprogram-slide-view": "0.0.3",
      "wepy": "^1.7.2"
      }, },
      "devDependencies": { "devDependencies": {
      "@wepy/cli": "^2.0.0-alpha.28",
      "@babel/core": "^7.1.0", "@babel/core": "^7.1.0",
      "@babel/preset-env": "^7.1.0", "@babel/preset-env": "^7.1.0",
      "@wepy/babel-plugin-import-regenerator": "0.0.2", "@wepy/babel-plugin-import-regenerator": "0.0.2",
      "@wepy/cli": "^2.0.0-alpha.28",
      "@wepy/compiler-babel": "^2.0.1",
      "@wepy/compiler-less": "^2.0.1",
      "babel-eslint": "^7.2.1", "babel-eslint": "^7.2.1",
      "cross-env": "^5.1.3", "cross-env": "^5.1.3",
      "eslint": "^3.18.0", "eslint": "^3.18.0",
      ...@@ -34,9 +38,9 @@ ...@@ -34,9 +38,9 @@
      "eslint-plugin-html": "^2.0.1", "eslint-plugin-html": "^2.0.1",
      "eslint-plugin-promise": "^3.5.0", "eslint-plugin-promise": "^3.5.0",
      "eslint-plugin-standard": "^2.0.1", "eslint-plugin-standard": "^2.0.1",
      "wepy-eslint": "^1.5.3",
      "less": "^3.8.1", "less": "^3.8.1",
      "@wepy/compiler-babel": "^2.0.1", "wepy-compiler-babel": "^1.5.3",
      "@wepy/compiler-less": "^2.0.1" "wepy-compiler-less": "^1.3.14",
      "wepy-eslint": "^1.5.3"
      } }
      } }
      src/pages/approvePreview.wpy
      View file @ a143acc5
      ...@@ -98,42 +98,57 @@ ...@@ -98,42 +98,57 @@
      <div class="gaishu"> <div class="gaishu">
      <span style="font-size: 40rpx;font-weight: 600">订单总览</span> <span style="font-size: 40rpx;font-weight: 600">订单总览</span>
      <span>课题组名称：{{orderList[0]['课题组名称']}}</span> <span>课题组名称：{{ queryOrder.ktzName }}</span>
      <span>请购人：{{ queryOrder.omsOrderApproveItemVoList[0].addcartName }}</span>
      <span>提交人：{{ queryOrder.omsOrderApproveItemVoList[0].submitName }}</span>
      <span>提交时间：{{ queryOrder.omsOrderApproveItemVoList[0].submitTime }}</span>
      <span>经费号：{{ queryOrder.ktkCode }}</span>
      <span>合计：{{ queryOrder.totalPrice }}</span>
      <!-- <span>课题组名称：{{orderList[0]['课题组名称']}}</span>
      <span>请购人：{{orderList[0]['请购人姓名']}}</span> <span>请购人：{{orderList[0]['请购人姓名']}}</span>
      <span>提交人：{{orderList[0]['购物车提交人姓名']}}</span> <span>提交人：{{orderList[0]['购物车提交人姓名']}}</span>
      <span>提交时间：{{orderList[0]['购物车提交时间']}}</span> <span>提交时间：{{orderList[0]['购物车提交时间']}}</span>
      <span>经费号：{{orderList[0]['课题卡号']}}</span> <span>经费号：{{orderList[0]['课题卡号']}}</span>
      <span>合计：{{orderList[0]['总价']}}</span> <span>合计：{{orderList[0]['总价']}}</span> -->
      </div> </div>
      <div style="background: white;width: 100%;margin-top: 20rpx;padding-top: 20rpx"> <div style="background: white;width: 100%;margin-top: 20rpx;padding-top: 20rpx">
      <span style="font-size: 40rpx;font-weight: 600;margin-left: 30rpx">商品明细</span> <span style="font-size: 40rpx;font-weight: 600;margin-left: 30rpx">商品明细</span>
      <div class="detail" v-for="(item,index) in orderList"> <div class="detail" v-for="(item,index) in queryOrder.omsOrderApproveItemVoList" :key="index">
      <div>{{item['品名']}}</div> <div>{{ item.productName }}</div>
      <div>{{ '品牌: '+ item.brand +'；货号：'+ item.itemNo +'；包装规格' + item.spec }}</div>
      <div>数量：{{ item.quantity }}</div>
      <div>成交价：{{ item.payPrice }}</div>
      <div>总价：{{ item.totalPrice }}</div>
      <!-- <div>{{item['品名']}}</div>
      <div>{{'品牌: '+ item['品牌']+'；货号：'+ item['货号']+'；包装规格'+item['包装规格']}}</div> <div>{{'品牌: '+ item['品牌']+'；货号：'+ item['货号']+'；包装规格'+item['包装规格']}}</div>
      <div>数量：{{item['数量']}}</div> <div>数量：{{item['数量']}}</div>
      <div>成交价：{{item['成交价']}}</div> <div>成交价：{{item['成交价']}}</div>
      <div>总价：{{item['成交价']*item['数量']}}</div> <div>总价：{{item['成交价']*item['数量']}}</div> -->
      </div> </div>
      </div> </div>
      </div> </div>
      <div style="width: 100%;padding: 30rpx;box-sizing: border-box;display: flex;flex-direction: column"> <div style="width: 100%;padding: 30rpx;box-sizing: border-box;display: flex;flex-direction: column">
      <van-button @tap="pass()" block type="primary">审批通过</van-button> <van-button @tap="pass()" block type="primary">审批通过</van-button>
      <van-button @tap="showRefuse()" block type="warning" style="margin-top: 20rpx">审批驳回</van-button> <van-button @tap="showRefuse()" block type="warning" style="margin-top: 20rpx">审批拒绝</van-button>
      <!-- <van-button @tap="history()" block type="info" style="margin-top: 20rpx">查看审批历史</van-button>--> <!-- <van-button @tap="history()" block type="info" style="margin-top: 20rpx">查看审批历史</van-button>-->
      </div> </div>
      <van-dialog <van-dialog
      @close="onDClose" @close="onDClose"
      @cancel="cancelRefuse"
      use-slot use-slot
      @confirm="refuse" @confirm="refuse"
      theme="round-button" theme="round-button"
      title="填写驳回原因" show-cancel-button
      title="填写拒绝原因"
      show="{{ showM }}" show="{{ showM }}"
      > >
      <input style="width: 550rpx" v-model="refuse_reason" placeholder="请输入驳回原因"/> <div style="padding: 100rpx 40rpx;width: 550rpx">
      <input style="width: 550rpx" v-model="refuse_reason" placeholder="请输入拒绝原因"/>
      </div>
      </van-dialog> </van-dialog>
      </div> </div>
      </template> </template>
      ...@@ -158,128 +173,234 @@ wepy.page({ ...@@ -158,128 +173,234 @@ wepy.page({
      data: { data: {
      orderList: [], orderList: [],
      showM: false, showM: false,
      refuse_reason: '' refuse_reason: '',
      queryOrder: {},
      userInfo: {},
      requestURL: ''
      }, },
      computed: {}, computed: {},
      methods: { methods: {
      onDClose(){ onDClose(){
      this.showM = false this.showM = false
      }, },
      cancelRefuse() {
      wx.showToast({
      title: '您取消了拒绝',
      icon: 'none'
      })
      },
      pass(){ pass(){
      let order = wx.getStorageSync("order"); wx.showModal({
      let username = wx.getStorageSync("username"); title: "提示",
      let role = wx.getStorageSync("role"); content: '确认通过吗？',
      success: (res) => {
      const param = { if(res.confirm) {
      username: username, 订单id: order, 审批角色: role, wx.showLoading({
      审批通过: '1', 审批说明: '', 审批人帐号: username title: '加载中'
      } });
      http.post('/order/orderApproval', param).then(res => { wx.request({
      if(res.flag === '1'){ url: `${this.requestURL}/approveOpera/pass`,
      wx.showModal({ method: 'post',
      title: "提示", header: {
      showCancel: false, 'Content-Type': 'application/json',
      content: '审批完成', 'token': this.userInfo.token
      //点击确认返回main界面 },
      success: function (res) { data: {
      wx.navigateBack({ taskId: this.queryOrder.taskId,
      delta: 1 option: '通过',
      }) type: '审批'
      } },
      }) success: (res) => {
      }else{ if (res.data.success) {
      wx.showModal({ wx.hideLoading()
      title: "提示", wx.showModal({
      showCancel: false, title: "提示",
      content: res.message, showCancel: false,
      //点击确认返回main界面 content: '通过成功',
      success: function (res) { //点击确认返回main界面
      wx.navigateBack({ success: function (res) {
      delta: 1 wx.navigateBack({
      }) delta: 1
      } })
      }) }
      })
      } else {
      wx.hideLoading()
      wx.showModal({
      title: "提示",
      showCancel: false,
      content: res.message,
      success: function (res) {
      }
      })
      }
      }
      });
      }else {
      wx.showToast({
      title: '您取消了通过',
      icon: 'none'
      })
      }
      } }
      }) })
      // let order = wx.getStorageSync("order");
      // let username = wx.getStorageSync("username");
      // let role = wx.getStorageSync("role");
      // const param = {
      // username: username, 订单id: order, 审批角色: role,
      // 审批通过: '1', 审批说明: '', 审批人帐号: username
      // }
      // http.post('/order/orderApproval', param).then(res => {
      // if(res.flag === '1'){
      // wx.showModal({
      // title: "提示",
      // showCancel: false,
      // content: '审批完成',
      // //点击确认返回main界面
      // success: function (res) {
      // wx.navigateBack({
      // delta: 1
      // })
      // }
      // })
      // }else{
      // wx.showModal({
      // title: "提示",
      // showCancel: false,
      // content: res.message,
      // //点击确认返回main界面
      // success: function (res) {
      // wx.navigateBack({
      // delta: 1
      // })
      // }
      // })
      // }
      // })
      }, },
      showRefuse(){ showRefuse(){
      this.showM = true this.showM = true
      this.refuse_reason = ''
      }, },
      refuse(){ refuse(){
      if(!this.refuse_reason){ if(!this.refuse_reason || this.refuse_reason.trim() === ''){
      wx.showToast({ wx.showToast({
      title: '请输入驳回原因', title: '请输入拒绝原因',
      icon: 'none' icon: 'none'
      }) })
      return return
      } }
      let order = wx.getStorageSync("order"); this.showM = false
      let username = wx.getStorageSync("username"); wx.showLoading({
      let role = wx.getStorageSync("role"); title: '加载中'
      });
      const param = { wx.request({
      username: username, 订单id: order, 审批角色: role, url: `${this.requestURL}/approveOpera/refuse`,
      审批通过: '0', 审批说明: this.refuse_reason, 审批人帐号: username method: 'post',
      } header: {
      http.post('/order/orderApproval', param).then(res => { 'Content-Type': 'application/json',
      this.showM = false 'token': this.userInfo.token
      if(res.flag === '1'){ },
      wx.showModal({ data: {
      title: "提示", taskId: this.queryOrder.taskId,
      showCancel: false, option: this.refuse_reason,
      content: '审批完成', type: '审批'
      //点击确认返回main界面 },
      success: function (res) { success: (res) => {
      wx.navigateBack({ if (res.data.success) {
      delta: 1 wx.hideLoading()
      }) wx.showModal({
      } title: "提示",
      }) showCancel: false,
      }else{ content: '拒绝成功',
      wx.showModal({ //点击确认返回main界面
      title: "提示", success: function (res) {
      showCancel: false, wx.navigateBack({
      content: res.message, delta: 1
      //点击确认返回main界面 })
      success: function (res) { }
      wx.navigateBack({ })
      delta: 1 } else {
      }) wx.hideLoading()
      } wx.showModal({
      }) title: "提示",
      showCancel: false,
      content: res.message,
      success: function (res) {
      }
      })
      }
      } }
      }) });
      // let order = wx.getStorageSync("order");
      // let username = wx.getStorageSync("username");
      // let role = wx.getStorageSync("role");
      // const param = {
      // username: username, 订单id: order, 审批角色: role,
      // 审批通过: '0', 审批说明: this.refuse_reason, 审批人帐号: username
      // }
      // http.post('/order/orderApproval', param).then(res => {
      // this.showM = false
      // if(res.flag === '1'){
      // wx.showModal({
      // title: "提示",
      // showCancel: false,
      // content: '审批完成',
      // //点击确认返回main界面
      // success: function (res) {
      // wx.navigateBack({
      // delta: 1
      // })
      // }
      // })
      // }else{
      // wx.showModal({
      // title: "提示",
      // showCancel: false,
      // content: res.message,
      // //点击确认返回main界面
      // success: function (res) {
      // wx.navigateBack({
      // delta: 1
      // })
      // }
      // })
      // }
      // })
      }, },
      history(){ history(){
      } }
      }, },
      onLoad() { onLoad(option) {
      let role = wx.getStorageSync("role"); this.requestURL = wx.getStorageSync('requestURL')
      let order = wx.getStorageSync("order"); // 接收上个页面传过来的 一整个对象
      http.post('/JPost?query=订单详情_mp', { 订单号: order }).then(res => { this.queryOrder = JSON.parse(decodeURIComponent(option.data))
      if(res.flag === "1"){ if(!this.queryOrder.orderSn) {
      if(res.data[0]['等待审批']!==role){ wx.showModal({
      wx.showModal({ title: "提示",
      title: "提示", showCancel: false,
      showCancel: false, content: '未找到此订单',
      content: '您当前无法审批此订单，可能尚未流转至您或者您已审批过此订单', //点击确认返回main界面
      //点击确认返回main界面 success: function (res) {
      success: function (res) { wx.navigateBack({
      wx.navigateBack({ delta: 1
      delta: 1
      })
      }
      }) })
      return
      } }
      this.orderList = res.data })
      }else{ }
      wx.getStorage({
      key: 'user_info',
      success: (res) => {
      this.userInfo = JSON.parse(res.data);
      },
      fail: function() {
      wx.showModal({ wx.showModal({
      title: "提示", title: "提示",
      showCancel: false, showCancel: false,
      content: '未找到此订单', content: '用户未登录',
      //点击确认返回main界面
      success: function (res) { success: function (res) {
      wx.navigateBack({ wx.navigateBack({
      delta: 1 delta: 1
      ...@@ -287,7 +408,40 @@ wepy.page({ ...@@ -287,7 +408,40 @@ wepy.page({
      } }
      }) })
      } }
      }) });
      // let role = wx.getStorageSync("role");
      // let order = wx.getStorageSync("order");
      // http.post('/JPost?query=订单详情_mp', { 订单号: order }).then(res => {
      // if(res.flag === "1"){
      // if(res.data[0]['等待审批']!==role){
      // wx.showModal({
      // title: "提示",
      // showCancel: false,
      // content: '您当前无法审批此订单，可能尚未流转至您或者您已审批过此订单',
      // //点击确认返回main界面
      // success: function (res) {
      // wx.navigateBack({
      // delta: 1
      // })
      // }
      // })
      // return
      // }
      // this.orderList = res.data
      // }else{
      // wx.showModal({
      // title: "提示",
      // showCancel: false,
      // content: '未找到此订单',
      // //点击确认返回main界面
      // success: function (res) {
      // wx.navigateBack({
      // delta: 1
      // })
      // }
      // })
      // }
      // })
      } }
      }) })
      </script> </script>
      ......
      src/pages/index.wpy
      View file @ a143acc5
      ...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
      <van-empty v-if="orderList.length === 0" description="暂无待审批订单" /> <van-empty v-if="orderList.length === 0" description="暂无待审批订单" />
      <div @tap="item_click(item)" v-for="(item,index) in orderList" class="item"> <div @tap="item_click(item)" v-for="(item,index) in orderList" class="item">
      {{ item }} {{ item.orderSn }}
      </div> </div>
      </div> </div>
      </div> </div>
      ...@@ -97,7 +97,19 @@ import { mapState } from '@wepy/x' ...@@ -97,7 +97,19 @@ import { mapState } from '@wepy/x'
      import store from '../store' import store from '../store'
      import testMixin from '../mixins/test' import testMixin from '../mixins/test'
      import http from '../common/http.js' import http from '../common/http.js'
      const CryptoJS = require('../common/crypto-js.js')
      const encode = (data) => {
      let key = '0123456789ABCDEF'
      let iv = '0123456789ABCDEF'
      key = CryptoJS.enc.Utf8.parse(key)
      iv = CryptoJS.enc.Utf8.parse(iv)
      let decrypt = CryptoJS.AES.encrypt(data, key, {
      iv: iv,
      mode: CryptoJS.mode.CBC,
      padding: CryptoJS.pad.Pkcs7
      })
      return decrypt.toString()
      }
      const app = getApp().$wepy.$options const app = getApp().$wepy.$options
      wepy.page({ wepy.page({
      ...@@ -109,16 +121,22 @@ wepy.page({ ...@@ -109,16 +121,22 @@ wepy.page({
      mixins: [testMixin], mixins: [testMixin],
      data: { data: {
      orderList: [] orderList: [],
      userInfo: {},
      platformOptions: []
      }, },
      computed: {}, computed: {},
      methods: { methods: {
      item_click(item){ item_click(item){
      wx.setStorageSync("order", item); let data = JSON.stringify(item)
      wx.navigateTo({ wx.navigateTo({
      url: '/pages/approvePreview' url: '/pages/approvePreview?data=' + encodeURIComponent(data)
      }) })
      // wx.setStorageSync("order", item);
      // wx.navigateTo({
      // url: '/pages/approvePreview'
      // })
      }, },
      scanBtClick(){ scanBtClick(){
      ...@@ -165,112 +183,252 @@ wepy.page({ ...@@ -165,112 +183,252 @@ wepy.page({
      // } // }
      } }
      }) })
      },
      getList() {
      wx.getStorage({
      key: 'user_info',
      success: (res) => {
      this.userInfo = JSON.parse(res.data);
      wx.showLoading({
      title: '加载中'
      });
      const requestURL = wx.getStorageSync('requestURL')
      wx.request({
      url: `${requestURL}/approveOpera/listUnApprove`,
      method: 'post',
      header: {
      'Content-Type': 'application/json',
      'token': this.userInfo.token
      },
      data: {
      searchText: '',
      startTime: '',
      endTime: ''
      },
      success: (res) => {
      if (res.data.success) {
      this.orderList = res.data.data
      } else {
      this.orderList = []
      }
      wx.hideLoading()
      }
      });
      },
      fail: function() {
      console.log('用户未登录');
      }
      });
      } }
      }, },
      onShow() { onShow() {
      let usernam = wx.getStorageSync("username"); // let usernam = wx.getStorageSync("username");
      let rol = wx.getStorageSync("role"); // let rol = wx.getStorageSync("role");
      let pla = wx.getStorageSync("plat"); // let pla = wx.getStorageSync("plat");
      if(usernam&&rol){ // if(usernam&&rol){
      let ktzCo = wx.getStorageSync("ktzCode"); // if(pla === 'fwh'){
      // wx.setStorageSync('urlPrefix','http://tmallab.com/cgfwhj/')
      let param = { 审批角色: rol } // }else{
      if(ktzCo){ // wx.setStorageSync('urlPrefix','https://www.tmallab.com/pkunxyj')
      param.课题组编号 = ktzCo // }
      }
      // http.post('/approveOpera/listUnApprove', param).then(res => {
      if(pla === 'fwh'){ // if(res.success){
      wx.setStorageSync('urlPrefix','https://www.tmallab.com/fwhj') // this.orderList = res.data
      }else{ // }else{
      wx.setStorageSync('urlPrefix','https://www.tmallab.com/pkunxyj') // this.orderList = []
      } // }
      // })
      http.post('/JPost?query=vue_审批list', param).then(res => { // }
      if(res.flag === "1"){ // wx.getStorage({
      this.orderList = res.data.map(v=>{ // key: 'user_info',
      return v['订单号'] // success: (res) => {
      }) // this.userInfo = JSON.parse(res.data);
      let l = Array.from(new Set(this.orderList)) // this.getList()
      this.orderList = l // },
      }else{ // fail: function() {
      this.orderList = [] // console.log('用户未登录');
      } // }
      }) // });
      } // let usernam = wx.getStorageSync("username");
      // let rol = wx.getStorageSync("role");
      // let pla = wx.getStorageSync("plat");
      // if(usernam&&rol){
      // let ktzCo = wx.getStorageSync("ktzCode");
      // let param = { 审批角色: rol }
      // if(ktzCo){
      // param.课题组编号 = ktzCo
      // }
      // if(pla === 'fwh'){
      // wx.setStorageSync('urlPrefix','https://www.tmallab.com/fwhj')
      // }else{
      // wx.setStorageSync('urlPrefix','https://www.tmallab.com/pkunxyj')
      // }
      // http.post('/JPost?query=vue_审批list', param).then(res => {
      // if(res.flag === "1"){
      // this.orderList = res.data.map(v=>{
      // return v['订单号']
      // })
      // let l = Array.from(new Set(this.orderList))
      // this.orderList = l
      // }else{
      // this.orderList = []
      // }
      // })
      // }
      }, },
      onLoad(options) { async onLoad(options) {
      if(options.scene){ const query = encodeURIComponent('获取平台信息')
      var scene = decodeURIComponent(options.scene); const tag = encodeURIComponent('显示标识')
      wx.request({
      console.log(scene) url: 'https://tmallab.cn/fwhj/JPost?query=' + query + '&' + tag + '=a',
      var arrPara = scene.split(","); method: 'get',
      headers: {
      var role = arrPara[0] 'noSec': 'yes'
      var username = arrPara[1] },
      var plat = arrPara[3] success: ({ data: res }) => {
      if (res.flag === '1') {
      wx.setStorageSync("plat", plat); this.platformOptions = res.data.map(item => ({
      platformName: item['平台简称'],
      if(role==='JS0010'){ platformNum: item['平台编号'],
      role = 'JSXXXX' platformUrl: item['平台请求地址'],
      } ifParameter: item['是否有台账'],
      personnelAccess: item['人员权限']
      wx.setStorageSync("username", username); }))
      wx.setStorageSync("role", role);
      try {
      var ktzCode = arrPara[2]
      wx.setStorageSync("ktzCode", ktzCode);
      }catch (e){
      console.log(e)
      }
      }
      let usernam = wx.getStorageSync("username");
      let rol = wx.getStorageSync("role");
      let pla = wx.getStorageSync("plat");
      let ktzCo = wx.getStorageSync("ktzCode");
      if(!usernam||!rol||!pla){
      wx.showModal({
      title: "提示",
      showCancel: false,
      content: '请登录网页扫码登录此小程序',
      //点击确认返回main界面
      success: function (res) {
      } }
      }) if(options.scene){
      return // 例子：scene=role,userId,ktzCode,platform
      } // 如：scene=JS0010,CG00000,RG00086,fwh
      let scene = decodeURIComponent(options.scene);
      let arrPara = scene.split(",");
      if(pla === 'fwh'){
      wx.setStorageSync('urlPrefix','https://www.tmallab.com/fwhj') let role = arrPara[0]
      }else{ let username = arrPara[1]
      wx.setStorageSync('urlPrefix','https://www.tmallab.com/pkunxyj') let plat = arrPara[3]
      } let requestURL = this.platformOptions.find(v => v.platformNum === plat).platformUrl
      wx.setStorage({
      key: 'requestURL',
      data: requestURL
      });
      // wx.setStorageSync("plat", plat);
      wx.request({
      url: `${requestURL}/loginByUR`,
      method: 'post',
      header: {
      'Content-Type': 'application/json',
      },
      data: {
      username: username,
      roleNum: role,
      verifyCode:encode(username)
      },
      success: (res) => {
      if (res.data.success) {
      let userInfo={
      sysid:res.data.data.umsUserRoleQueryVo[0].sysid,
      token:res.data.data.token,
      username:res.data.data.username,
      个人中心名称:res.data.data.umsUserRoleQueryVo[0].centerName,
      个人中心跳转:res.data.data.umsUserRoleQueryVo[0].centerPage,
      姓名:res.data.data.umsUserRoleQueryVo[0].personName,
      学工号:res.data.data.jobNum,
      已认证:null,
      角色编号:res.data.data.umsUserRoleQueryVo[0].roleNum,
      课题组名称:res.data.data.umsUserRoleQueryVo[0].groupName,
      课题组编号:res.data.data.umsUserRoleQueryVo[0].groupCode,
      默认页:'index'
      };
      wx.setStorage({
      key: 'user_info',
      data: JSON.stringify(userInfo),
      });
      this.getList()
      } else {
      wx.showModal({
      title: '提示',
      content: res.message,
      success: function() {
      }
      })
      }
      }
      });
      // if(role==='JS0010'){
      // role = 'JSXXXX'
      // }
      let param = { 审批角色: rol } // wx.setStorageSync("username", username);
      if(ktzCo){ // wx.setStorageSync("role", role);
      param.课题组编号 = ktzCo
      }
      http.post('/JPost?query=vue_审批list', param).then(res => { // try {
      if(res.flag === "1"){ // var ktzCode = arrPara[2]
      this.orderList = res.data.map(v=>{ // wx.setStorageSync("ktzCode", ktzCode);
      return v['订单号'] // }catch (e){
      }) // console.log(e)
      let l = Array.from(new Set(this.orderList)) // }
      this.orderList = l } else {
      }else{ wx.getStorage({
      this.orderList = [] key: 'user_info',
      success: (res) => {
      this.userInfo = JSON.parse(res.data);
      this.getList()
      },
      fail: function() {
      console.log('用户未登录');
      }
      });
      }
      } }
      }) })
      } // let usernam = wx.getStorageSync("username");
      // let rol = wx.getStorageSync("role");
      // let pla = wx.getStorageSync("plat");
      // let ktzCo = wx.getStorageSync("ktzCode");
      // if(!usernam||!rol||!pla){
      // wx.showModal({
      // title: "提示",
      // showCancel: false,
      // content: '请登录网页扫码登录此小程序',
      // //点击确认返回main界面
      // success: function (res) {
      // }
      // })
      // return
      // }
      // if(pla === 'fwh'){
      // wx.setStorageSync('urlPrefix','https://www.tmallab.com/fwhj')
      // }else{
      // wx.setStorageSync('urlPrefix','https://www.tmallab.com/pkunxyj')
      // }
      // let param = { 审批角色: rol }
      // if(ktzCo){
      // param.课题组编号 = ktzCo
      // }
      // http.post('/JPost?query=vue_审批list', param).then(res => {
      // if(res.flag === "1"){
      // this.orderList = res.data.map(v=>{
      // return v['订单号']
      // })
      // let l = Array.from(new Set(this.orderList))
      // this.orderList = l
      // }else{
      // this.orderList = []
      // }
      // })
      },
      }) })
      </script> </script>
      <config> <config>
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment