diff --git a/.drone.yml b/.drone.yml index 365d8c02..5fdf5504 100644 --- a/.drone.yml +++ b/.drone.yml @@ -45,6 +45,7 @@ steps: - sleep 3s - cd .. - rm -rf publish + - mkdir publish - name: deploy image: appleboy/drone-scp @@ -53,11 +54,37 @@ steps: port: 16085 username: Administrator password: Microsoft@2022 - timeout: "30m" - command_timeout: "30m" + command_timeout: 30m target: /d/BQ-JS/publish source: build/publish - strip_components: 2 + + # - name: deploy + # image: appleboy/drone-scp + # settings: + # host: dev.ccwin-in.com + # port: 16085 + # username: Administrator + # password: Microsoft@2022 + # timeout: "30m" + # command_timeout: "30m" + # target: /d/BQ-JS/publish + # source: build/publish + # strip_components: 2 + + # - name: deploy + # image: atmoz/sftp + # volumes: + # - ./build/publish:/home/foo/upload + # ports: + # - 16085:22 + # command: Administrator@Microsoft@2022:::upload + # settings: + # host: dev.ccwin-in.com + # port: 16085 + # username: Administrator + # password: Microsoft@2022 + # source: build/publish + # target: /d/BQ-JS/publish - name: start image: appleboy/drone-ssh diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js index 2c307f43..a81d3104 100644 --- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js +++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/settle/_check.js @@ -243,7 +243,7 @@ export default { }, lu: { type: "string", - title: "零件号", + title: "客户零件号", }, partDesc: { type: "string",