Merge remote-tracking branch 'origin/dev_ml_522'

jshERP-web/src/views/bill/dialog/BillDetail.vue

@@ -477,21 +477,17 @@
               :columns="columns"
               :dataSource="dataSource"
             >
-              <template slot="customBarCode" slot-scope="text, record">
-                <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
-                <a-popover placement="right" trigger="click">
-                  <template slot="content"
-                    ><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px"
-                  /></template>
-                  <div class="item-info" v-if="record.imgName">
-                    <img
-                      v-if="record.imgName"
-                      :src="getImgUrl(record.imgName, record.imgSmall)"
-                      class="item-img"
-                      title="查看大图"
-                    />
-                  </div>
-                </a-popover>
+              <template slot="unitPrice" slot-scope="text, record">
+                {{ record.unitPrice }}
+                <a-tooltip title="单价和默认采购价不一致">
+                  <a-icon type="info-circle" style="color: #f5222d" v-show="record.unitPrice!=record.defaultPurchaseDecimal" />
+                </a-tooltip>
+              </template>
+              <template slot="wholesaleDecimal" slot-scope="text, record">
+                {{ record.wholesaleDecimal }}
+                <a-tooltip title="销售价和默认销售价不一致">
+                  <a-icon type="info-circle" style="color: #f5222d" v-show="record.wholesaleDecimal!=record.defaultWholesaleDecimal" />
+                </a-tooltip>
               </template>
             </a-table>
           </div>
@@ -609,21 +605,17 @@
               :dataSource="dataSource"
               :scroll="{ x: 1500, y: 300 }"
             >
-              <template slot="customBarCode" slot-scope="text, record">
-                <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
-                <a-popover placement="right" trigger="click">
-                  <template slot="content"
-                    ><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px"
-                  /></template>
-                  <div class="item-info" v-if="record.imgName">
-                    <img
-                      v-if="record.imgName"
-                      :src="getImgUrl(record.imgName, record.imgSmall)"
-                      class="item-img"
-                      title="查看大图"
-                    />
-                  </div>
-                </a-popover>
+              <template slot="unitPrice" slot-scope="text, record">
+                {{ record.unitPrice }}
+                <a-tooltip title="单价和默认采购价不一致">
+                  <a-icon type="info-circle" style="color: #f5222d" v-show="record.unitPrice!=record.defaultPurchaseDecimal" />
+                </a-tooltip>
+              </template>
+              <template slot="wholesaleDecimal" slot-scope="text, record">
+                {{ record.wholesaleDecimal }}
+                <a-tooltip title="销售价和默认销售价不一致">
+                  <a-icon type="info-circle" style="color: #f5222d" v-show="record.wholesaleDecimal!=record.defaultWholesaleDecimal" />
+                </a-tooltip>
               </template>
             </a-table>
           </div>
@@ -915,21 +907,11 @@
               :dataSource="dataSource"
               :scroll="{ x: '100%'}"
             >
-              <template slot="customBarCode" slot-scope="text, record">
-                <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
-                <a-popover placement="right" trigger="click">
-                  <template slot="content"
-                    ><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px"
-                  /></template>
-                  <div class="item-info" v-if="record.imgName">
-                    <img
-                      v-if="record.imgName"
-                      :src="getImgUrl(record.imgName, record.imgSmall)"
-                      class="item-img"
-                      title="查看大图"
-                    />
-                  </div>
-                </a-popover>
+              <template slot="unitPrice" slot-scope="text, record">
+                {{ record.unitPrice }}
+                <a-tooltip title="单价和默认销售价不一致">
+                  <a-icon type="info-circle" style="color: #f5222d" v-show="record.unitPrice!=record.defaultWholesaleDecimal" />
+                </a-tooltip>
               </template>
             </a-table>
           </div>
@@ -1051,21 +1033,11 @@
               :dataSource="dataSource"
               :scroll="{ x: '100%' }"
             >
-              <template slot="customBarCode" slot-scope="text, record">
-                <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
-                <a-popover placement="right" trigger="click">
-                  <template slot="content"
-                    ><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px"
-                  /></template>
-                  <div class="item-info" v-if="record.imgName">
-                    <img
-                      v-if="record.imgName"
-                      :src="getImgUrl(record.imgName, record.imgSmall)"
-                      class="item-img"
-                      title="查看大图"
-                    />
-                  </div>
-                </a-popover>
+              <template slot="unitPrice" slot-scope="text, record">
+                {{ record.unitPrice }}
+                <a-tooltip title="单价和默认销售价不一致">
+                  <a-icon type="info-circle" style="color: #f5222d" v-show="record.unitPrice!=record.defaultWholesaleDecimal" />
+                </a-tooltip>
               </template>
             </a-table>
           </div>
@@ -1369,21 +1341,17 @@
               :dataSource="dataSource"
               :scroll="{ x: '100%' }"
             >
-              <template slot="customBarCode" slot-scope="text, record">
-                <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
-                <a-popover placement="right" trigger="click">
-                  <template slot="content"
-                    ><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px"
-                  /></template>
-                  <div class="item-info" v-if="record.imgName">
-                    <img
-                      v-if="record.imgName"
-                      :src="getImgUrl(record.imgName, record.imgSmall)"
-                      class="item-img"
-                      title="查看大图"
-                    />
-                  </div>
-                </a-popover>
+              <template slot="unitPrice" slot-scope="text, record">
+                {{ record.unitPrice }}
+                <a-tooltip title="单价和默认采购价不一致">
+                  <a-icon type="info-circle" style="color: #f5222d" v-show="record.unitPrice!=record.defaultPurchaseDecimal" />
+                </a-tooltip>
+              </template>
+              <template slot="wholesaleDecimal" slot-scope="text, record">
+                {{ record.wholesaleDecimal }}
+                <a-tooltip title="销售价和默认销售价不一致">
+                  <a-icon type="info-circle" style="color: #f5222d" v-show="record.wholesaleDecimal!=record.defaultWholesaleDecimal" />
+                </a-tooltip>
               </template>
             </a-table>
           </div>
@@ -1489,21 +1457,11 @@
               :dataSource="dataSource"
               :scroll="{ x: '100%' }"
             >
-              <template slot="customBarCode" slot-scope="text, record">
-                <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.barCode }}</div>
-                <a-popover placement="right" trigger="click">
-                  <template slot="content"
-                    ><img :src="getImgUrl(record.imgName, record.imgLarge)" width="500px"
-                  /></template>
-                  <div class="item-info" v-if="record.imgName">
-                    <img
-                      v-if="record.imgName"
-                      :src="getImgUrl(record.imgName, record.imgSmall)"
-                      class="item-img"
-                      title="查看大图"
-                    />
-                  </div>
-                </a-popover>
+              <template slot="unitPrice" slot-scope="text, record">
+                {{ record.unitPrice }}
+                <a-tooltip title="单价和默认销售价不一致">
+                  <a-icon type="info-circle" style="color: #f5222d" v-show="record.unitPrice!=record.defaultWholesaleDecimal" />
+                </a-tooltip>
               </template>
             </a-table>
           </div>
@@ -2081,85 +2039,66 @@ export default {
         { title: '备注', dataIndex: 'remark' },
       ],
       purchaseOrderColumns: [
-        { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
-        // { title: '规格', dataIndex: 'standard', width: 90 },
         { title: '生产日期', dataIndex: 'productionDate', width: 100 },
         { title: '保质期', dataIndex: 'expiryNum', width: 60 },
         { title: 'SKU', dataIndex: 'sku', width: 90 },
         { title: '仓库名称', dataIndex: 'depotName', width: 90 },
         { title: '仓库货架', dataIndex: 'position', width: 90 },
         { title: '包装规格', dataIndex: 'unitName', width: 90 },
-
         { title: '型号', dataIndex: 'model', width: 60 },
         { title: '颜色', dataIndex: 'color', width: 60 },
         { title: '品牌', dataIndex: 'brand', width: 90 },
-        { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
         { title: '库存', dataIndex: 'stock', width: 90 },
         { title: '单位', dataIndex: 'unit', width: 90 },
-        { title: '序列号', dataIndex: 'snList', width: 300 },
-        { title: '有效期', dataIndex: 'expirationDate', width: 90 },
         { title: '入库数量', dataIndex: 'operNumber', width: 90 },
-        { title: '已入库', dataIndex: 'finishNumber', width: 90 },
-        { title: '单价', dataIndex: 'unitPrice', width: 90 },
+        { title: '单价', dataIndex: 'unitPrice', width: 90, scopedSlots: { customRender: 'unitPrice' } },
+        { title: '销售价', dataIndex: 'wholesaleDecimal', width: 90, scopedSlots: { customRender: 'wholesaleDecimal' } },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
         { title: '税率(%)', dataIndex: 'taxRate', width: 90 },
         { title: '税额', dataIndex: 'taxMoney', width: 90 },
         { title: '价税合计', dataIndex: 'taxLastMoney', width: 90 },
         { title: '入库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '入库时间', dataIndex: 'warehousingTime', width: 90 },
-        { title: '重量', dataIndex: 'weight', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
       purchaseInColumns: [
-        { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
-        // { title: '规格', dataIndex: 'standard', width: 90 },
-
         { title: '生产日期', dataIndex: 'productionDate', width: 100 },
         { title: '保质期', dataIndex: 'expiryNum', width: 60 },
         { title: 'SKU', dataIndex: 'sku', width: 90 },
         { title: '仓库名称', dataIndex: 'depotName', width: 90 },
         { title: '仓库货架', dataIndex: 'position', width: 90 },
         { title: '包装规格', dataIndex: 'unitName', width: 90 },
-
         { title: '型号', dataIndex: 'model', width: 60 },
         { title: '颜色', dataIndex: 'color', width: 60 },
         { title: '品牌', dataIndex: 'brand', width: 90 },
-        { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
         { title: '库存', dataIndex: 'stock', width: 90 },
         { title: '单位', dataIndex: 'unit', width: 90 },
-        { title: '序列号', dataIndex: 'snList', width: 300 },
-        { title: '有效期', dataIndex: 'expirationDate', width: 90 },
         { title: '入库数量', dataIndex: 'operNumber', width: 90 },
-        { title: '已入库', dataIndex: 'finishNumber', width: 90 },
-        { title: '单价', dataIndex: 'unitPrice', width: 90 },
+        { title: '单价', dataIndex: 'unitPrice', width: 90, scopedSlots: { customRender: 'unitPrice' } },
+        { title: '销售价', dataIndex: 'wholesaleDecimal', width: 90, scopedSlots: { customRender: 'wholesaleDecimal' } },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
         { title: '税率(%)', dataIndex: 'taxRate', width: 90 },
         { title: '税额', dataIndex: 'taxMoney', width: 90 },
         { title: '价税合计', dataIndex: 'taxLastMoney', width: 90 },
         { title: '入库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '入库时间', dataIndex: 'warehousingTime', width: 90 },
-        { title: '重量', dataIndex: 'weight', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
       purchaseBackColumns: [
         { title: '仓库名称', dataIndex: 'depotName' },
-        { title: '条码', dataIndex: 'barCode' },
+        { title: 'SKU', dataIndex: 'sku' },
         { title: '名称', dataIndex: 'name' },
         { title: '规格', dataIndex: 'standard' },
         { title: '型号', dataIndex: 'model' },
         { title: '颜色', dataIndex: 'color' },
         { title: '品牌', dataIndex: 'brand' },
-        { title: '制造商', dataIndex: 'mfrs' },
         { title: '扩展信息', dataIndex: 'materialOther' },
         { title: '库存', dataIndex: 'stock' },
         { title: '单位', dataIndex: 'unit' },
-        { title: '序列号', dataIndex: 'snList', width: 300 },
-        { title: '批号', dataIndex: 'batchNumber' },
-        { title: '有效期', dataIndex: 'expirationDate' },
         { title: '数量', dataIndex: 'operNumber' },
         { title: '已出库', dataIndex: 'finishNumber' },
         { title: '单价', dataIndex: 'unitPrice' },
@@ -2172,27 +2111,18 @@ export default {
         { title: '备注', dataIndex: 'remark' },
       ],
       saleOrderColumns: [
-        { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
-        // { title: '规格', dataIndex: 'standard', width: 90 },
-
         { title: 'SKU', dataIndex: 'sku', width: 90 },
         { title: '仓库名称', dataIndex: 'depotName', width: 90 },
         { title: '仓库货架', dataIndex: 'position', width: 90 },
         { title: '包装规格', dataIndex: 'unitName', width: 90 },
-
-        // { title: '规格', dataIndex: 'standard', width: 60 },
         { title: '型号', dataIndex: 'model', width: 60 },
         { title: '颜色', dataIndex: 'color', width: 60 },
         { title: '品牌', dataIndex: 'brand', width: 90 },
-        { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
         { title: '库存', dataIndex: 'stock', width: 90 },
-        { title: '单位', dataIndex: 'unit', width: 90 },
-        { title: '序列号', dataIndex: 'snList', width: 300 },
-        { title: '有效期', dataIndex: 'expirationDate', width: 90 },
+        { title: '单价', dataIndex: 'unitPrice', width: 90, scopedSlots: { customRender: 'unitPrice' } },
         { title: '出库数量', dataIndex: 'operNumber', width: 90 },
-        { title: '已出库', dataIndex: 'finishNumber', width: 90 },
         { title: '单价', dataIndex: 'unitPrice', width: 90 },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
         { title: '税率(%)', dataIndex: 'taxRate', width: 90 },
@@ -2200,40 +2130,28 @@ export default {
         { title: '价税合计', dataIndex: 'taxLastMoney', width: 90 },
         { title: '出库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '出库时间', dataIndex: 'warehousingTime', width: 90 },
-
-        { title: '重量', dataIndex: 'weight', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
       saleOutColumns: [
-        { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
-        // { title: '规格', dataIndex: 'standard', width: 90 },
-
         { title: 'SKU', dataIndex: 'sku', width: 90 },
         { title: '仓库名称', dataIndex: 'depotName', width: 90 },
         { title: '仓库货架', dataIndex: 'position', width: 90 },
         { title: '包装规格', dataIndex: 'unitName', width: 90 },
-
-        // { title: '规格', dataIndex: 'standard', width: 60 },
         { title: '型号', dataIndex: 'model', width: 60 },
         { title: '颜色', dataIndex: 'color', width: 60 },
         { title: '品牌', dataIndex: 'brand', width: 90 },
-        { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
         { title: '库存', dataIndex: 'stock', width: 90 },
         { title: '单位', dataIndex: 'unit', width: 90 },
-        { title: '序列号', dataIndex: 'snList', width: 300 },
-        { title: '有效期', dataIndex: 'expirationDate', width: 90 },
         { title: '出库数量', dataIndex: 'operNumber', width: 90 },
-        { title: '已出库', dataIndex: 'finishNumber', width: 90 },
-        { title: '单价', dataIndex: 'unitPrice', width: 90 },
+        { title: '单价', dataIndex: 'unitPrice', width: 90, scopedSlots: { customRender: 'unitPrice' } },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
         { title: '税率(%)', dataIndex: 'taxRate', width: 90 },
         { title: '税额', dataIndex: 'taxMoney', width: 90 },
         { title: '价税合计', dataIndex: 'taxLastMoney', width: 90 },
         { title: '出库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '出库时间', dataIndex: 'warehousingTime', width: 90 },
-        { title: '重量', dataIndex: 'weight', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
       saleBackColumns: [
@@ -2244,13 +2162,9 @@ export default {
         { title: '型号', dataIndex: 'model' },
         { title: '颜色', dataIndex: 'color' },
         { title: '品牌', dataIndex: 'brand' },
-        { title: '制造商', dataIndex: 'mfrs' },
         { title: '扩展信息', dataIndex: 'materialOther' },
         { title: '库存', dataIndex: 'stock' },
         { title: '单位', dataIndex: 'unit' },
-        { title: '序列号', dataIndex: 'snList', width: 300 },
-        { title: '批号', dataIndex: 'batchNumber' },
-        { title: '有效期', dataIndex: 'expirationDate' },
         { title: '数量', dataIndex: 'operNumber' },
         { title: '已入库', dataIndex: 'finishNumber' },
         { title: '单价', dataIndex: 'unitPrice' },
@@ -2258,82 +2172,61 @@ export default {
         { title: '税率(%)', dataIndex: 'taxRate' },
         { title: '税额', dataIndex: 'taxMoney' },
         { title: '价税合计', dataIndex: 'taxLastMoney' },
-        { title: '重量', dataIndex: 'weight' },
         { title: '仓位货架', dataIndex: 'position' },
         { title: '备注', dataIndex: 'remark' },
       ],
       otherInColumns: [
-        { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
-        // { title: '规格', dataIndex: 'standard', width: 90 },
-
         { title: '生产日期', dataIndex: 'productionDate', width: 100 },
         { title: '保质期', dataIndex: 'expiryNum', width: 60 },
         { title: 'SKU', dataIndex: 'sku', width: 90 },
         { title: '仓库名称', dataIndex: 'depotName', width: 90 },
         { title: '仓库货架', dataIndex: 'position', width: 90 },
         { title: '包装规格', dataIndex: 'unitName', width: 90 },
-
         { title: '型号', dataIndex: 'model', width: 60 },
         { title: '颜色', dataIndex: 'color', width: 60 },
         { title: '品牌', dataIndex: 'brand', width: 90 },
-        { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
         { title: '库存', dataIndex: 'stock', width: 90 },
         { title: '单位', dataIndex: 'unit', width: 90 },
-        { title: '序列号', dataIndex: 'snList', width: 300 },
-        { title: '有效期', dataIndex: 'expirationDate', width: 90 },
         { title: '入库数量', dataIndex: 'operNumber', width: 90 },
-        { title: '单价', dataIndex: 'unitPrice', width: 90 },
+        { title: '单价', dataIndex: 'unitPrice', width: 90, scopedSlots: { customRender: 'unitPrice' } },
+        { title: '销售价', dataIndex: 'wholesaleDecimal', width: 90, scopedSlots: { customRender: 'wholesaleDecimal' } },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
         { title: '入库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '入库时间', dataIndex: 'warehousingTime', width: 90 },
-        { title: '重量', dataIndex: 'weight', width: 90 },
+        { title: '备注', dataIndex: 'remark', width: 90 },
       ],
       otherOutColumns: [
-        { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
-        // { title: '规格', dataIndex: 'standard', width: 90 },
         { title: 'SKU', dataIndex: 'sku', width: 90 },
         { title: '仓库名称', dataIndex: 'depotName', width: 90 },
         { title: '仓库货架', dataIndex: 'position', width: 90 },
         { title: '包装规格', dataIndex: 'unitName', width: 90 },
-
-        // { title: '规格', dataIndex: 'standard', width: 60 },
         { title: '型号', dataIndex: 'model', width: 60 },
         { title: '颜色', dataIndex: 'color', width: 60 },
         { title: '品牌', dataIndex: 'brand', width: 90 },
-        { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
         { title: '库存', dataIndex: 'stock', width: 90 },
         { title: '单位', dataIndex: 'unit', width: 90 },
-        { title: '序列号', dataIndex: 'snList', width: 300 },
-        { title: '有效期', dataIndex: 'expirationDate', width: 90 },
         { title: '出库数量', dataIndex: 'operNumber', width: 90 },
-        { title: '单价', dataIndex: 'unitPrice', width: 90 },
+        { title: '单价', dataIndex: 'unitPrice', width: 90, scopedSlots: { customRender: 'unitPrice' } },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
         { title: '出库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '出库时间', dataIndex: 'warehousingTime', width: 90 },
-        { title: '重量', dataIndex: 'weight', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
       allocationOutColumns: [
-        { title: '批次号', dataIndex: 'batchNumber', width: 90 },
         { title: '名称', dataIndex: 'name', width: 115 },
-        // { title: '规格', dataIndex: 'standard', width: 90 },
-
         { title: '生产日期', dataIndex: 'productionDate', width: 100 },
         { title: '保质期', dataIndex: 'expiryNum', width: 60 },
         { title: 'SKU', dataIndex: 'sku', width: 90 },
         { title: '仓库名称', dataIndex: 'depotName', width: 90 },
         { title: '仓库货架', dataIndex: 'position', width: 90 },
         { title: '包装规格', dataIndex: 'unitName', width: 90 },
-
-        // { title: '规格', dataIndex: 'standard', width: 60 },
         { title: '型号', dataIndex: 'model', width: 60 },
         { title: '颜色', dataIndex: 'color', width: 60 },
         { title: '品牌', dataIndex: 'brand', width: 90 },
-        { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
         { title: '库存', dataIndex: 'stock', width: 90 },
         { title: '调入仓库', dataIndex: 'anotherDepotName' },
@@ -2341,12 +2234,9 @@ export default {
         { title: '数量', dataIndex: 'operNumber', width: 90 },
         { title: '单价', dataIndex: 'unitPrice', width: 90 },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
-
         { title: '实际出库数量', dataIndex: 'actualQuantityInStorage', width: 115 },
         { title: '出库人', dataIndex: 'warehousingUserName', width: 90 },
         { title: '出库时间', dataIndex: 'warehousingTime', width: 90 },
-
-        { title: '重量', dataIndex: 'weight', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
       assembleColumns: [
@@ -2517,69 +2407,8 @@ export default {
           },
         },
       ]
-      if (record.status === '3') {
-        //部分采购|部分销售的时候显示全部列
-        for (let i = 0; i < this.defColumns.length; i++) {
-          currentCol.push(this.defColumns[i])
-        }
-      } else if (record.purchaseStatus === '3') {
-        //将已出库的标题转为已采购，针对销售订单转采购订单的场景
-        for (let i = 0; i < this.defColumns.length; i++) {
-          let info = {}
-          info.title = this.defColumns[i].title
-          info.dataIndex = this.defColumns[i].dataIndex
-          if (this.defColumns[i].width) {
-            info.width = this.defColumns[i].width
-          }
-          if (this.defColumns[i].dataIndex === 'finishNumber') {
-            info.title = '已采购'
-          }
-          if (this.defColumns[i].dataIndex === 'barCode') {
-            info.scopedSlots = { customRender: 'customBarCode' }
-          }
-          currentCol.push(info)
-        }
-      } else {
-        for (let i = 0; i < this.defColumns.length; i++) {
-          //移除列
-          let needRemoveKeywords = [
-            'finishNumber',
-            'snList',
-            'batchNumber',
-            'expirationDate',
-            'sku',
-            'weight',
-            'position',
-            'brand',
-            'mfrs',
-          ]
-          if (needRemoveKeywords.indexOf(this.defColumns[i].dataIndex) === -1) {
-            let info = {}
-            info.title = this.defColumns[i].title
-            info.dataIndex = this.defColumns[i].dataIndex
-            if (this.defColumns[i].width) {
-              info.width = this.defColumns[i].width
-            }
-            if (this.defColumns[i].dataIndex === 'barCode') {
-              info.scopedSlots = { customRender: 'customBarCode' }
-            }
-            currentCol.push(info)
-          }
-          //添加有数据的列
-          if (needAddkeywords.indexOf(this.defColumns[i].dataIndex) > -1) {
-            let info = {}
-            info.title = this.defColumns[i].title
-            info.dataIndex = this.defColumns[i].dataIndex
-            if (this.defColumns[i].width) {
-              info.width = this.defColumns[i].width
-            }
-            currentCol.push(info)
-          }
-        }
-      }
-      this.defColumns = currentCol
+      this.defColumns = [...currentCol,...this.defColumns]
       this.initColumnsSetting()
-      // this.columns = currentCol
     },
     initPlatform() {
       getPlatformConfigByKey({ platformKey: 'bill_print_flag' }).then((res) => {

jshERP-web/src/views/bill/modules/OtherInModal.vue

@@ -328,13 +328,13 @@ export default {
             type: FormTypes.inputNumber,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }], },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
           {
             title: '销售价',
             key: 'wholesaleDecimal',
             width: '120px',
             type: FormTypes.slot,
-            validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }],
+            validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
           },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber,disabled: true, statistics: true },
           {

jshERP-web/src/views/bill/modules/OtherOutModal.vue

@@ -152,13 +152,13 @@
             >
             </a-select>
           </template>
-          <template #wholesaleDecimal="{ handleChange, value, index,allValues }">
+          <!-- <template #wholesaleDecimal="{ handleChange, value, index,allValues }">
             <a-input :value="value" @change="($event) => onChangePrice($event,handleChange)">
               <a-tooltip slot="suffix" title="修改后和默认价格不一致">
                 <a-icon type="info-circle" style="color: #f5222d" v-show="getDefaultWholesaleDecimal(index,'defaultWholesaleDecimal',value,allValues)" />
               </a-tooltip>
             </a-input>
-          </template>
+          </template> -->
           <template #unitPrice="{ handleChange, value, index,allValues }">
             <a-input :value="value" @change="($event) => onChangePrice($event,handleChange)">
               <a-tooltip slot="suffix" title="修改后和默认价格不一致">
@@ -312,7 +312,7 @@ export default {
             width: '120px',
             type: FormTypes.normal,
           },
-          { title: '销售价', key: 'wholesaleDecimal', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }] },
+          // { title: '销售价', key: 'wholesaleDecimal', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }] },
           {
             title: '出库数量',
             key: 'operNumber',
@@ -320,7 +320,7 @@ export default {
             type: FormTypes.inputNumber,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }], },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true },
           {
             title: '出库人',

jshERP-web/src/views/bill/modules/PurchaseInModal.vue

@@ -212,7 +212,7 @@
               <a-input
                 style="width: 100%"
                 placeholder="请输入优惠率"
-                v-decorator.trim="['discount']"
+                v-decorator.trim="['discount',validatorRules.discount]"
                 suffix="%"
                 @change="onChangeDiscount"
               />
@@ -229,7 +229,7 @@
             >
               <a-input
                 placeholder="请输入付款优惠"
-                v-decorator.trim="['discountMoney']"
+                v-decorator.trim="['discountMoney',validatorRules.discountMoney]"
                 @change="onChangeDiscountMoney"
               />
             </a-form-item>
@@ -255,7 +255,7 @@
               data-title="其它费用"
               data-intro="比如快递费、油费、过路费"
             >
-              <a-input placeholder="请输入其它费用" v-decorator.trim="['otherMoney']" @change="onChangeOtherMoney" />
+              <a-input placeholder="请输入其它费用" v-decorator.trim="['otherMoney',validatorRules.otherMoney]" @change="onChangeOtherMoney" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -494,13 +494,13 @@ export default {
             type: FormTypes.inputNumber,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }], },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
           {
             title: '销售价',
             key: 'wholesaleDecimal',
             width: '120px',
             type: FormTypes.slot,
-            validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }],
+            validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
           },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true },
           {
@@ -547,12 +547,21 @@ export default {
         changeAmount: {
           rules: [
             { required: true, message: '请输入金额，如果为空请填0！' },
-            { pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' },
+            { pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' },
           ],
         },
         depotId: {
           rules: [{ required: true, message: '请选择仓库名!' }],
         },
+        discount: {
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+        },
+        discountMoney: {
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+        },
+        otherMoney: {
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+        },
       },
       url: {
         add: '/depotHead/addDepotHeadAndDetail',

jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue

@@ -236,7 +236,7 @@
               <a-input
                 style="width: 100%"
                 placeholder="请输入优惠率"
-                v-decorator.trim="['discount']"
+                v-decorator.trim="['discount', validatorRules.discount]"
                 suffix="%"
                 @change="onChangeDiscount"
               />
@@ -253,7 +253,7 @@
             >
               <a-input
                 placeholder="请输入付款优惠"
-                v-decorator.trim="['discountMoney']"
+                v-decorator.trim="['discountMoney', validatorRules.discountMoney]"
                 @change="onChangeDiscountMoney"
               />
             </a-form-item>
@@ -485,13 +485,13 @@ export default {
             type: FormTypes.inputNumber,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }], },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
           {
             title: '销售价',
             key: 'wholesaleDecimal',
             width: '120px',
             type: FormTypes.slot,
-            validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }],
+            validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
           },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true, },
           {
@@ -525,6 +525,15 @@ export default {
         accountId: {
           rules: [{ required: true, message: '请选择结算账户！' }],
         },
+        price: {
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+        },
+        discount: {
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+        },
+        discountMoney: {
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+        },
       },
       url: {
         add: '/depotHead/addDepotHeadAndDetail',

jshERP-web/src/views/bill/modules/SaleOrderModal.vue

@@ -209,7 +209,7 @@
               <a-input
                 style="width: 100%"
                 placeholder="请输入优惠率"
-                v-decorator.trim="['discount']"
+                v-decorator.trim="['discount',validatorRules.discount]"
                 suffix="%"
                 @change="onChangeDiscount"
               />
@@ -226,7 +226,7 @@
             >
               <a-input
                 placeholder="请输入付款优惠"
-                v-decorator.trim="['discountMoney']"
+                v-decorator.trim="['discountMoney',validatorRules.discountMoney]"
                 @change="onChangeDiscountMoney"
               />
             </a-form-item>
@@ -471,6 +471,15 @@ export default {
         accountId: {
           rules: [{ required: true, message: '请选择结算账户！' }],
         },
+        discount: {
+          rules: [{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '格式不正确!' }],
+        },
+        discountMoney: {
+          rules: [{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '格式不正确!' }],
+        },
+        changeAmount: {
+          rules: [{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '格式不正确!' }],
+        },
       },
       url: {
         add: '/depotHead/addDepotHeadAndDetail',

jshERP-web/src/views/bill/modules/SaleOutModal.vue

@@ -229,7 +229,7 @@
               <a-input
                 style="width: 100%"
                 placeholder="请输入优惠率"
-                v-decorator.trim="['discount']"
+                v-decorator.trim="['discount',validatorRules.discount]"
                 suffix="%"
                 @change="onChangeDiscount"
               />
@@ -246,7 +246,7 @@
             >
               <a-input
                 placeholder="请输入付款优惠"
-                v-decorator.trim="['discountMoney']"
+                v-decorator.trim="['discountMoney',validatorRules.discountMoney]"
                 @change="onChangeDiscountMoney"
               />
             </a-form-item>
@@ -272,7 +272,7 @@
               data-title="其它费用"
               data-intro="比如快递费、油费、过路费"
             >
-              <a-input placeholder="请输入其它费用" v-decorator.trim="['otherMoney']" @change="onChangeOtherMoney" />
+              <a-input placeholder="请输入其它费用" v-decorator.trim="['otherMoney',validatorRules.otherMoney]" @change="onChangeOtherMoney" />
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="8" :md="12" :sm="24">
@@ -528,7 +528,7 @@ export default {
             type: FormTypes.inputNumber,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }], },
+          { title: '单价', key: 'unitPrice', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }], },
           { title: '金额', key: 'allPrice', width: '120px', type: FormTypes.inputNumber,disabled: true, statistics: true },
           {
             title: '税额',
@@ -567,10 +567,19 @@ export default {
         accountId: {
           rules: [{ required: true, message: '请选择结算账户！' }],
         },
+        discount: {
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+        },
+        discountMoney: {
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+        },
+        otherMoney: {
+          rules: [{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '格式不正确!' }],
+        },
         changeAmount: {
           rules: [
             { required: true, message: '请输入金额，如果为空请填0！' },
-            { pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' },
+            { pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' },
           ],
         },
         depotId: {

jshERP-web/src/views/material/MaterialList.vue

@@ -2,7 +2,7 @@
 <template>
   <a-row :gutter="24">
     <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :style="cardStyle" :bordered="false">
         <!-- 查询区域 -->
         <div class="table-page-search-wrapper">
           <!-- 搜索区域 -->

jshERP-web/src/views/material/modules/MaterialModal.vue

@@ -398,6 +398,10 @@ export default {
             dataIndex: 'batchNumber',
           },
           {
+            title: 'SKU',
+            dataIndex: 'sku',
+          },
+          {
             title: '单位',
             dataIndex: 'commodityUnit',
           },
@@ -585,10 +589,10 @@ export default {
           rules: [{ required: true, message: '请选择类别!' }],
         },
         defaultWholesaleDecimal: {
-          rules: [{ required: true, message: '请输入默认销售价!' }],
+          rules: [{ required: true, message: '请输入默认销售价!' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
         },
         defaultPurchaseDecimal: {
-          rules: [{ required: true, message: '请输入默认采购价!' }],
+          rules: [{ required: true, message: '请输入默认采购价!' },{ pattern: /^(?:0|[1-9]\d*)(?:\.\d{1,4})?$/, message: '金额格式不正确!' }],
         },
       },
       url: {

jshERP-web/src/views/task/modules/FlowModal.vue

@@ -52,7 +52,7 @@
                 message: '请选择',
                 trigger: 'change',
               }:{}">
-                <a-select v-model="item.auditor" @change="changeAuditor($event,index)" allowClear placeholder="请选择" :disabled="item.auditorType==2||item.auditorType==3||isReadOnly" style="width: 100%;">
+                <a-select v-model="item.auditor" @change="changeAuditor($event,index)" allowClear placeholder="请选择" :disabled="item.auditorType!=1||isReadOnly" style="width: 100%;">
                   <a-select-option v-for="(item, index) in _userList" :disabled="item.disabled" :key="index" :value="item.id">
                     {{ item.userName }}
                   </a-select-option>