'bugfix'

config/download.js

@@ -9,8 +9,8 @@ export default (url = '', baseUrl = '', data = {}, dataType = 'JSON', type = 'GE
     baseUrl = baseUrl;
   } else if (process.env.NODE_ENV === 'production') {
     if (baseUrl) {
-      let buildUrl = "https://test.hajwy.com/"
-      // let buildUrl = "https://pms.hajwy.com/"
+      // let buildUrl = "https://test.hajwy.com/"
+      let buildUrl = "https://pms.hajwy.com/"
       switch (baseUrl) {
         case '/landcrm':
           baseUrl = prodServer("landcrm");

config/fetch.js

@@ -28,8 +28,8 @@ export default async (url = '', baseUrl = '', data = {}, dataType = 'JSON', type
     baseUrl = baseUrl;
   } else if (process.env.NODE_ENV === 'production') {
     if (baseUrl) {
-      let buildUrl = "https://test.hajwy.com/"
-      // let buildUrl = "https://pms.hajwy.com/"
+      // let buildUrl = "https://test.hajwy.com/"
+      let buildUrl = "https://pms.hajwy.com/"
       switch (baseUrl) {
         case '/landcrm':
           // baseUrl = 'https://test.hajwy.com/landcrm';

config/index.js

@@ -34,7 +34,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       "/community": { //基础服务
-        target: "https:/test.hajwy.com/community",
+        target: "https:/pms.hajwy.com/community",
         // target: "http://172.18.1.40:8989/community",
         secure: false,
         changeOrigin: true,
@@ -43,7 +43,7 @@ module.exports = {
         }
       },
       "/landcrm": { //基础服务
-        target: "https://test.hajwy.com/landcrm",
+        target: "https://pms.hajwy.com/landcrm",
         secure: false,
         changeOrigin: true,
         pathRewrite: {
@@ -51,7 +51,7 @@ module.exports = {
         }
       },
       "/mkf": { //地区、项目获取
-        target: 'https://test.hajwy.com/landcrm',
+        target: 'https://pms.hajwy.com/landcrm',
         secure: false,
         changeOrigin: true,
         pathRewrite: {
@@ -59,7 +59,7 @@ module.exports = {
         }
       },
       "/hajwy": { //采购结算明细对接
-        target: 'https://test.hajwy.com/qpi/rest',
+        target: 'https://pms.hajwy.com/qpi/rest',
         secure: false,
         changeOrigin: true,
         pathRewrite: {
@@ -69,7 +69,7 @@ module.exports = {
       "/purchase": { //采采购管理整体测试
         // target: "http://www.jihengcc.cn:17080/purchase", //采购供应商管理测试
         // target: "https://test.hajwy.com/purchase", //采购供应商管理测试
-        target: "https://test.hajwy.com/purchase",
+        target: "https://pms.hajwy.com/purchase",
         // target: "http://172.18.1.40:8989/purchase",
         secure: false,
         changeOrigin: true,

config/util.js

@@ -19,7 +19,7 @@ export const filter_param = (o) => {
 export const toChinesNum = (num) => {
   let changeNum = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
   let unit = ["", "拾", "佰", "仟", "万"];
-  let sUnit = ["角", "分"];
+  let sUnit = ["角", "分", "厘"];
   let newSNum = "";
   let otNum = num;
   num = parseInt(num);
@@ -41,7 +41,11 @@ export const toChinesNum = (num) => {
     for (let i = 0; i < sNum.length; i++) {
       newSNum += i > 0 && sNum[i] == 0 && sNum[i - 1] == 0 ? "" : changeNum[sNum[i]] + sUnit[i];
     }
-    return overWan ? getWan(overWan) + "万" + getWan(noWan) + '元' + newSNum : getWan(num) + '元' + newSNum;
+    if (otNum.toString().split('.')[0] == "0") {
+      return '零' + (overWan ? getWan(overWan) + "万" + getWan(noWan) + '元' + newSNum : getWan(num) + '元' + newSNum);
+    } else {
+      return overWan ? getWan(overWan) + "万" + getWan(noWan) + '元' + newSNum : getWan(num) + '元' + newSNum;
+    }
   } else {
     return overWan ? getWan(overWan) + "万" + getWan(noWan) + '元整' : getWan(num) + "元整";
   }

src/page/baseInfo/components/supply/supplyEdit.vue

@@ -631,7 +631,7 @@
           <Col span="4" class-name="tables">当前报价</Col>
           <Col span="8" class-name="tables">
             <InputNumber
-              :min="1"
+              :min="0"
               :precision="3"
               :active-change="false"
               v-model="xzbjForm.dqbj"

src/page/purchase/components/balance/balanceAdd.vue

@@ -114,7 +114,7 @@
           <Col span="4" class-name="tables">{{ form.total }}</Col>
           <Col span="4" class-name="tables">调整金额（元）</Col>
           <Col span="4" class-name="tables">
-          <InputNumber :min="1" :precision="3" :active-change="false" :disabled="form.spzt != '1' && form.spzt != '4'" v-model="form.tzje"
+          <InputNumber :min="0" :precision="3" :active-change="false" :disabled="form.spzt != '1' && form.spzt != '4'" v-model="form.tzje"
             placeholder="请输入" style="width: 95%" />
           </Col>
           <Col span="4" class-name="tables">实际支付金额（元）</Col>

src/page/purchase/components/order/orderAdd.vue

@@ -336,7 +336,7 @@
           border
         >
           <template slot-scope="{ row, index }" slot="purchaseNum">
-            <InputNumber :min="1" :precision="2" :active-change="false" :disabled="
+            <InputNumber :min="0" :precision="2" :active-change="false" :disabled="
                 (form.spzt != '1' && form.spzt != '4') || row.isCancel == '1'
               "
               v-model="tableData[index].purchaseNum"
@@ -348,7 +348,7 @@
             <a @click.prevent="goDetail(row)">{{ row.applyRuleCode }}</a>
           </template>
           <template slot-scope="{ row, index }" slot="price">
-            <InputNumber :min="1" :precision="3" :active-change="false" :disabled="form.spzt != '1' && form.spzt != '4'"
+            <InputNumber :min="0" :precision="3" :active-change="false" :disabled="form.spzt != '1' && form.spzt != '4'"
               v-model="tableData[index].price" placeholder="请输入" style="width: 95%" />
           </template>
           <template slot-scope="{ row, index }" slot="totalPrice">

src/page/purchase/components/plan/planAdd.vue

@@ -142,7 +142,7 @@
           @on-select-all-cancel="tableOnCancel" class="">
           <template slot-scope="{ row, index }" slot="amount">
             <div>
-              <InputNumber :min="1" :precision="2" :active-change="false" v-model="tableData[index].amount"
+              <InputNumber :min="0" :precision="2" :active-change="false" v-model="tableData[index].amount"
                 :disabled="form.spzt == '2' || form.spzt == '1'" placeholder="请输入" style="width: 95%" />
             </div>
           </template>

src/page/purchase/components/pool/poolAdd.vue

@@ -329,7 +329,7 @@
         >
           <template slot-scope="{ row, index }" slot="purchaseNum">
             <InputNumber
-              :min="1"
+              :min="0"
               :precision="2"
               :active-change="false"
               :disabled="form.spzt == '2'"
@@ -340,7 +340,7 @@
           </template>
           <template slot-scope="{ row, index }" slot="price">
             <InputNumber
-              :min="1"
+              :min="0"
               :precision="3"
               :active-change="false"
               :disabled="form.spzt == '2' || form.spzt == '3'"