Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue

@@ -891,7 +891,7 @@ export default {
           return
         }
         const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'manufactorSettlementPrice' || column.property === 'freight' || column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney') {
+        if (column.property === 'manufactorSettlementPrice' || column.property === 'freight' || column.property === 'estimateRebate' || column.property === 'withholdCost' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney' || column.property === 'notUploadMoney') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue

@@ -615,7 +615,7 @@ export default {
           return
         }
         const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'manufactorSettlementPrice' || column.property === 'freight' || column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney') {
+        if (column.property === 'manufactorSettlementPrice' || column.property === 'freight' || column.property === 'topAmount' || column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney' || column.property === 'notUploadMoney') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue

@@ -877,7 +877,7 @@ export default {
           return
         }
         const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney') {
+        if (column.property === 'estimateRebate' || column.property === 'withholdCost' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney' || column.property === 'notUploadMoney') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue

@@ -601,7 +601,7 @@ export default {
           return
         }
         const values = data.map(item => Number(item[column.property]))
-        if (column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney') {
+        if (column.property === 'estimateRebate' || column.property === 'expectCost' || column.property === 'uploadMoney' || column.property === 'secondaryUploadMoney' || column.property === 'stayDetermineMoney' || column.property === 'money' || column.property === 'diffAmount' || column.property === 'adjustmentMoney' || column.property === 'notUploadMoney') {
           sums[index] = values.reduce((prev, curr) => {
             const value = Number(curr)
             if (!isNaN(value)) {

yxt-as-ui/src/views/operation/salesInvoice/salesInvoice.vue

@@ -22,18 +22,14 @@
                 <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
               </el-form-item>
               <el-form-item label="申请日期">
-                <el-date-picker v-model="listQuery.params.startDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                <el-date-picker v-model="listQuery.params.startDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
-                  type="date" placeholder="选择日期"></el-date-picker>
                 <span style="padding: 0 8px">至</span>
-                <el-date-picker v-model="listQuery.params.endDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                <el-date-picker v-model="listQuery.params.endDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
-                  type="date" placeholder="选择日期"></el-date-picker>
               </el-form-item>
               <el-form-item label="办结日期">
-                <el-date-picker v-model="listQuery.params.startDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                <el-date-picker v-model="listQuery.params.startDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
-                  type="date" placeholder="选择日期"></el-date-picker>
                 <span style="padding: 0 8px">至</span>
-                <el-date-picker v-model="listQuery.params.endDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                <el-date-picker v-model="listQuery.params.endDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
-                  type="date" placeholder="选择日期"></el-date-picker>
               </el-form-item>
               <el-form-item label="开票单位">
                 <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
@@ -54,19 +50,16 @@
         <!--End查询列表部分-->
         <div class="listtop">
           <div class="tit">配件销售单开票申请列表</div>
-          <!--  <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
-            :limit.sync="listQuery.size" class="pagination" @pagination="getList" /> -->
         </div>
         <!--Start 主页面主要部分 -->
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
-            @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50"/>
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
             <el-table-column label="操作" width="180" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" :disabled="scope.row.state == '已办结'" size="small"
+                <el-button type="primary" size="small" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理
-                  @click="toEdit(scope.row)">办理</el-button>
+                </el-button>
                 <el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
@@ -97,40 +90,32 @@
         <div class="pages">
           <div class="tit"/>
           <!-- 翻页 -->
-          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
-            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
         </div>
         <!--End查询列表部分-->
       </div>
     </div>
     <!--新增及修改 -->
-    <salesInvoiceAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState"
+    <salesInvoiceAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
-      @reloadlist="getList" />
     <!-- 详情 -->
     <salesInvoiceInfo v-show="viewState == 4" ref="divInfo" @doback="resetState"/>
 
     <!-- 流程审批记录 -->
     <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
-      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no"
+      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
-        :src="this.centerDialogVisible === true ? url :''"></iframe>
     </el-dialog>
 
     <!-- 附件 -->
-    <el-dialog title="附件" :visible.sync="filesDialogVisible" width="78%" height="1%"
+    <el-dialog title="附件" :visible.sync="filesDialogVisible" width="78%" height="1%" :before-close="closeFilesDialogVisible">
-      :before-close="closeFilesDialogVisible">
       <div style=" margin-top: -20px">
-        <el-image class="addinputInfo" style="width: 150px;height: 150px;padding: 10px;"
+        <el-image class="addinputInfo" style="width: 150px;height: 150px;padding: 10px;" v-for="(item, index) in filesList" :key="index" :src="item" :preview-src-list="filesList"/>
-          v-for="(item, index) in filesList" :key="index" :src="item" :preview-src-list="filesList" />
       </div>
-
     </el-dialog>
-
   </div>
 </template>
 
 <script>
 import Pagination from '@/components/pagination'
-  import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/operation/salesInvoice'
 import salesInvoiceAdd from './salesInvoiceAdd'
@@ -143,7 +128,6 @@
   name: 'SalesTicket',
   components: {
     Pagination,
-      pageye,
     ButtonBar,
     salesInvoiceAdd,
     salesInvoiceInfo
@@ -204,7 +188,7 @@
         }
       },
       filesList: [],
-        filesDialogVisible: false,
+      filesDialogVisible: false
     }
   },
   created() {
@@ -384,7 +368,8 @@
         }).catch(e => {
           loading.close()
         })
-        }).catch(() => {})
+      }).catch(() => {
+      })
     },
     // 修改、编辑、详情返回列表页面
     resetState() {

yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue

@@ -243,7 +243,7 @@
           <el-row>
             <el-col :span="24">
               <div class="span-sty" style="border-right: 0px">应付金额：</div>
-              <el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额：{{ cgTotal }} + 运费：<el-input @keyup.native="formobj.freight = getNumber(formobj.freight, 2)" v-model="formobj.freight" style="width: 160px" clearable placeholder="" /> - 优惠：<el-input @keyup.native="formobj.discountAmount = getNumber(formobj.discountAmount, 2)" v-model="formobj.discountAmount" style="width: 160px" clearable placeholder="" /> + 误差调整：<el-input @keyup.native="formobj.errorAmount = getNumber(formobj.errorAmount, 2)" v-model="formobj.errorAmount" style="width: 160px" clearable placeholder="" /></span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额：{{ cgTotal }} + 运费：<el-input @keyup.native="formobj.freight = getNumber(formobj.freight, 2)" v-model="formobj.freight" style="width: 160px" clearable placeholder="" /> - 优惠：<el-input @keyup.native="formobj.discountAmount = getNumber(formobj.discountAmount, 2)" v-model="formobj.discountAmount" style="width: 160px" clearable placeholder="" /> + 误差调整：<el-input @keyup.native="formobj.errorAmount = inputByAstrict(formobj.errorAmount, 2)" v-model="formobj.errorAmount" style="width: 160px" clearable placeholder="" /></span></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -511,6 +511,29 @@ export default {
       }
       return val
     },
+    inputByAstrict(val, limit) {
+      let value = val.replace(/[^\-\d.]/g, '') // 只能输入'.'和'-'及数字
+      value = value.replace(/^\./g, '') // 第一个字符不能是'.'
+      value = value.replace(/\.{2,}/g, '.') // 不能连续输入'.'
+      value = value.replace(/(\.\d+)\./g, '$1') // '.'后面不能在输入'0'
+      value = value.replace(/(-)\./g, '$1') // '-'后面不能输入'.'
+      value = value.replace(/\-{2,}/g, '-') // 只保留一个'-'
+      value = value.replace(/(\d+|\.)-/g, '$1') // 数字和'.'后面不能跟'-', 例如11- 或 11.-
+      value = value.replace(/-(0){2,}/g, '$1') // 不能出现-00、-001、-0001等
+      value = value.replace(/(-)0+(\d+)/g, '$1$2') // 不能出现-01、-02等
+      value = value.replace(/^0+(\d)/, '$1') // 第一位0开头，0后面为数字，则过滤掉0， 取后面的数字
+      value = value.replace(/(\d{15})\d*/, '$1') // 最多保留15整数
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        value = value.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        value = value.replace(reg, '$1.$2')
+      }
+      return value
+    },
     purchaseTypeChange(value) {
       const choose = this.procurementType_list.filter((item) => item.dictValue === value)
       if (choose !== null && choose.length > 0) {

yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue

@@ -242,7 +242,7 @@
           <el-row>
             <el-col :span="24">
               <div class="span-sty" style="border-right: 0px">应付金额：</div>
-              <el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额：{{ cgTotal }} + 运费：<el-input @keyup.native="formobj.freight = getNumber(formobj.freight, 2)" v-model="formobj.freight" style="width: 160px" clearable placeholder="" /> - 优惠：<el-input @keyup.native="formobj.discountAmount = getNumber(formobj.discountAmount, 2)" v-model="formobj.discountAmount" style="width: 160px" clearable placeholder="" /> + 误差调整：<el-input @keyup.native="formobj.errorAmount = getNumber(formobj.errorAmount, 2)" v-model="formobj.errorAmount" style="width: 160px" clearable placeholder="" /></span></el-form-item>
+              <el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额：{{ cgTotal }} + 运费：<el-input @keyup.native="formobj.freight = getNumber(formobj.freight, 2)" v-model="formobj.freight" style="width: 160px" clearable placeholder="" /> - 优惠：<el-input @keyup.native="formobj.discountAmount = getNumber(formobj.discountAmount, 2)" v-model="formobj.discountAmount" style="width: 160px" clearable placeholder="" /> + 误差调整：<el-input @keyup.native="formobj.errorAmount = inputByAstrict(formobj.errorAmount, 2)" v-model="formobj.errorAmount" style="width: 160px" clearable placeholder="" /></span></el-form-item>
             </el-col>
           </el-row>
         </el-form>
@@ -502,6 +502,29 @@ export default {
       }
       return val
     },
+    inputByAstrict(val, limit) {
+      let value = val.replace(/[^\-\d.]/g, '') // 只能输入'.'和'-'及数字
+      value = value.replace(/^\./g, '') // 第一个字符不能是'.'
+      value = value.replace(/\.{2,}/g, '.') // 不能连续输入'.'
+      value = value.replace(/(\.\d+)\./g, '$1') // '.'后面不能在输入'0'
+      value = value.replace(/(-)\./g, '$1') // '-'后面不能输入'.'
+      value = value.replace(/\-{2,}/g, '-') // 只保留一个'-'
+      value = value.replace(/(\d+|\.)-/g, '$1') // 数字和'.'后面不能跟'-', 例如11- 或 11.-
+      value = value.replace(/-(0){2,}/g, '$1') // 不能出现-00、-001、-0001等
+      value = value.replace(/(-)0+(\d+)/g, '$1$2') // 不能出现-01、-02等
+      value = value.replace(/^0+(\d)/, '$1') // 第一位0开头，0后面为数字，则过滤掉0， 取后面的数字
+      value = value.replace(/(\d{15})\d*/, '$1') // 最多保留15整数
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        value = value.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        value = value.replace(reg, '$1.$2')
+      }
+      return value
+    },
     purchaseTypeChange(value) {
       const choose = this.procurementType_list.filter((item) => item.dictValue === value)
       if (choose !== null && choose.length > 0) {