feat:订单流程

jshERP-web/package.json

@@ -25,6 +25,7 @@
     "lodash.get": "^4.4.2",
     "lodash.pick": "^4.4.0",
     "md5": "^2.2.1",
+    "moment": "^2.30.1",
     "nprogress": "^0.2.0",
     "tailwindcss": "^4.0.17",
     "viser-vue": "^2.4.4",

jshERP-web/src/components/jeecg/JModal/index.vue

@@ -6,7 +6,6 @@
       :style="getStyle(modalStyle)"
       :visible="visible"
       :getContainer="() => $refs.container"
-      :maskStyle="{ top: '93px', left: '154px' }"
       :wrapClassName="wrapClassNameInfo()"
       :mask="isDesktop()"
       :maskClosable="false"

jshERP-web/src/components/jeecgbiz/JSelectMaterial/index.vue

@@ -0,0 +1,45 @@
+<template>
+  <div style="width: 100%">
+    <a-input-search
+      :value="value"
+      :title="value"
+      placeholder="请点击搜索按钮"
+      readOnly
+      :disabled="disabled"
+      @search="openModal"
+    ></a-input-search>
+    <JSelectMaterialModal ref="selectModal" :multi="true" @ok="selectOK" />
+  </div>
+</template>
+
+<script>
+import JSelectMaterialModal from '../modal/JSelectMaterialModal.vue';
+export default {
+  name: 'JSelectMaterial',
+  components: {
+    JSelectMaterialModal
+  },
+  props: {
+    value: {
+      type: String,
+      default: '',
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  methods: {
+    openModal() {
+      this.$refs.selectModal.showModal()
+    },
+    selectOK(rows, ids) {
+      this.$emit('change', {rows, ids})
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

jshERP-web/src/components/jeecgbiz/modal/JSelectMaterialModal.vue

@@ -18,7 +18,7 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="8">
                 <a-form-item label="关键词" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input ref="material" placeholder="请输入条码、名称、助记码等查询" v-model="queryParam.q"></a-input>
+                  <a-input ref="material" placeholder="请输入SKU、名称等查询" v-model="queryParam.q"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="8">
@@ -80,7 +80,7 @@
             ref="table"
             :scroll="scrollTrigger"
             size="middle"
-            rowKey="id"
+            rowKey="meId"
             :columns="columns"
             :dataSource="dataSource"
             :pagination="ipagination"
@@ -89,7 +89,7 @@
             :customRow="rowAction"
             @change="handleTableChange"
           >
-            <template slot="customBarCode" slot-scope="text, record">
+            <!-- <template slot="customBarCode" slot-scope="text, record">
               <div :style="record.imgName ? 'float:left;line-height:30px' : 'float:left;'">{{ record.mBarCode }}</div>
               <a-popover placement="right" trigger="click">
                 <template slot="content">
@@ -104,7 +104,7 @@
                   />
                 </div>
               </a-popover>
-            </template>
+            </template> -->
             <template slot="customName" slot-scope="text, record">
               {{ record.name }}
               <a-tag v-if="record.enableSerialNumber == 1" color="orange">序</a-tag>
@@ -167,18 +167,18 @@ export default {
           width: 60,
           scopedSlots: { customRender: 'action' },
         },
-        { dataIndex: 'sku', title: 'SKU' },
+        { dataIndex: 'sku', title: 'SKU', width: 250 },
         { dataIndex: 'name', title: '名称', scopedSlots: { customRender: 'customName' } },
         { dataIndex: 'categoryName', title: '类别' },
-        // { dataIndex: 'standard', title: '规格' },
-        { dataIndex: 'model', title: '型号' },
-        { dataIndex: 'color', title: '颜色' },
         { dataIndex: 'brand', title: '品牌' },
         { dataIndex: 'unit', title: '单位' },
-        { dataIndex: 'inventory', title: '库存' },
+        { dataIndex: 'standard', title: '规格' },
+        { dataIndex: 'color', title: '颜色' },
+        { dataIndex: 'weight', title: '重量(kg)' },
+        { dataIndex: 'model', title: '型号' },
+        { dataIndex: 'stock', title: '库存' },
         // { dataIndex: 'depotName', title: '仓库名称' },
         // { dataIndex: 'position', title: '仓库货架' },
-        // { dataIndex: 'expand', title: '扩展信息' },
       ],
       scrollTrigger: {},
       dataSource: [],
@@ -329,7 +329,7 @@ export default {
       this.$refs.modalForm.title = '新增商品'
     },
     handleEdit(record) {
-      getMaterialById({ mid: record.mid }).then((res) => {
+      getMaterialById({ mid: record.id }).then((res) => {
         this.$refs.modalForm.edit(res.data)
         this.$refs.modalForm.title = '编辑'
         this.$refs.modalForm.disableSubmit = false
@@ -370,7 +370,7 @@ export default {
       this.selectMaterialRows = []
       console.log('getSelectMaterialRows', this.selectedRowKeys)
       for (let i = 0, len = dataSource.length; i < len; i++) {
-        if (this.selectedRowKeys.includes(dataSource[i].id)) {
+        if (this.selectedRowKeys.includes(dataSource[i].meId)) {
           this.selectMaterialRows.push(dataSource[i])
           materialIds = materialIds + ',' + dataSource[i].sku
         }
@@ -394,6 +394,7 @@ export default {
           arr.push(this.dataSource[0].id)
           this.selectedRowKeys = arr
           this.handleSubmit()
+          console.log(this.selectedRowKeys,this.selectMaterialIds)
         } else {
           this.loadMaterialData(1)
         }
@@ -408,13 +409,22 @@ export default {
       return {
         on: {
           click: () => {
-            let arr = []
-            arr.push(record.id)
-            this.selectedRowKeys = arr
+            if(this.multi){
+              const i = this.selectedRowKeys.findIndex(key=> key === record.meId)
+              if(i===-1){
+                this.selectedRowKeys.push(record.meId)
+              }else{
+                this.selectedRowKeys.splice(i,1)
+              }
+            }else{
+              let arr = []
+              arr.push(record.meId)
+              this.selectedRowKeys = arr
+            }
           },
           dblclick: () => {
             let arr = []
-            arr.push(record.id)
+            arr.push(record.meId)
             this.selectedRowKeys = arr
             this.handleSubmit()
           },

jshERP-web/src/mixins/JEditableTableMixin.js

@@ -77,9 +77,6 @@ export const JEditableTableMixin = {
       this.eachAllTable((item) => {
         item.initialize()
       })
-      if(this.materialTable && this.materialTable.dataSource) {
-        this.materialTable.dataSource = []
-      }
       this.$emit('close')
     },
 

jshERP-web/src/views/bill/OtherInList.vue

@@ -15,7 +15,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input
-                    placeholder="请输入条码、名称、助记码、规格、型号等信息"
+                    placeholder="请输入SKU、名称、助记码、规格、型号等信息"
                     v-model="queryParam.materialParam"
                   ></a-input>
                 </a-form-item>
@@ -97,6 +97,7 @@
                     <a-select placeholder="请选择单据状态" v-model="queryParam.status">
                       <a-select-option value="0">未审核</a-select-option>
                       <a-select-option value="9" v-if="!checkFlag">审核中</a-select-option>
+                      <a-select-option value="8">审核不通过</a-select-option>
                       <a-select-option value="1">已审核</a-select-option>
                     </a-select>
                   </a-form-item>
@@ -187,6 +188,7 @@
             <template slot="customRenderStatus" slot-scope="status">
               <a-tag v-if="status == '0'" color="red">未审核</a-tag>
               <a-tag v-if="status == '1'" color="green">已审核</a-tag>
+              <a-tag v-if="status == '8'" color="red">审核不通过</a-tag>
               <a-tag v-if="status == '9'" color="orange">审核中</a-tag>
             </template>
           </a-table>

jshERP-web/src/views/bill/OtherOutList.vue

@@ -15,7 +15,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input
-                    placeholder="请输入条码、名称、助记码、规格、型号等信息"
+                    placeholder="请输入SKU、名称、助记码、规格、型号等信息"
                     v-model="queryParam.materialParam"
                   ></a-input>
                 </a-form-item>
@@ -97,6 +97,7 @@
                     <a-select placeholder="请选择单据状态" v-model="queryParam.status">
                       <a-select-option value="0">未审核</a-select-option>
                       <a-select-option value="9" v-if="!checkFlag">审核中</a-select-option>
+                      <a-select-option value="8">审核不通过</a-select-option>
                       <a-select-option value="1">已审核</a-select-option>
                     </a-select>
                   </a-form-item>
@@ -187,6 +188,7 @@
             <template slot="customRenderStatus" slot-scope="status">
               <a-tag v-if="status == '0'" color="red">未审核</a-tag>
               <a-tag v-if="status == '1'" color="green">已审核</a-tag>
+              <a-tag v-if="status == '8'" color="red">审核不通过</a-tag>
               <a-tag v-if="status == '9'" color="orange">审核中</a-tag>
             </template>
           </a-table>

jshERP-web/src/views/bill/PurchaseInList.vue

@@ -15,7 +15,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input
-                    placeholder="请输入条码、名称、助记码、规格、型号等信息"
+                    placeholder="请输入SKU、名称、助记码、规格、型号等信息"
                     v-model="queryParam.materialParam"
                   ></a-input>
                 </a-form-item>
@@ -119,6 +119,7 @@
                     <a-select placeholder="请选择单据状态" v-model="queryParam.status">
                       <a-select-option value="0">未审核</a-select-option>
                       <a-select-option value="9" v-if="!checkFlag">审核中</a-select-option>
+                      <a-select-option value="8">审核不通过</a-select-option>
                       <a-select-option value="1">已审核</a-select-option>
                       <a-select-option value="3">部分入库</a-select-option>
                       <a-select-option value="2">完成入库</a-select-option>
@@ -225,6 +226,7 @@
               <a-tag v-if="status == '1'" color="green">已审核</a-tag>
               <a-tag v-if="status == '2'" color="cyan">完成入库</a-tag>
               <a-tag v-if="status == '3'" color="blue">部分入库</a-tag>
+              <a-tag v-if="status == '8'" color="red">审核不通过</a-tag>
               <a-tag v-if="status == '9'" color="orange">审核中</a-tag>
             </template>
           </a-table>

jshERP-web/src/views/bill/PurchaseOrderList.vue

@@ -15,7 +15,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input
-                    placeholder="请输入条码、名称、助记码、规格、型号等信息"
+                    placeholder="请输入SKU、名称、助记码、规格、型号等信息"
                     v-model="queryParam.materialParam"
                   ></a-input>
                 </a-form-item>
@@ -87,10 +87,12 @@
                   <a-form-item label="单据状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="请选择单据状态" v-model="queryParam.status">
                       <a-select-option value="0">未审核</a-select-option>
-                      <a-select-option value="9" v-if="!checkFlag">审核中</a-select-option>
                       <a-select-option value="1">已审核</a-select-option>
-                      <a-select-option value="3">部分采购</a-select-option>
                       <a-select-option value="2">完成采购</a-select-option>
+                      <a-select-option value="3">部分采购</a-select-option>
+                      <a-select-option value="4">进行中</a-select-option>
+                      <a-select-option value="8">审核不通过</a-select-option>
+                      <a-select-option value="9" v-if="!checkFlag">审核中</a-select-option>
                     </a-select>
                   </a-form-item>
                 </a-col>
@@ -190,6 +192,7 @@
               <a-tag v-if="status == '2'" color="cyan">完成采购</a-tag>
               <a-tag v-if="status == '3'" color="blue">部分采购</a-tag>
               <a-tag v-if="status == '4'" color="purple">进行中</a-tag>
+              <a-tag v-if="status == '8'" color="red">审核不通过</a-tag>
               <a-tag v-if="status == '9'" color="orange">审核中</a-tag>
             </template>
           </a-table>

jshERP-web/src/views/bill/SaleOrderList.vue

@@ -16,7 +16,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input
-                    placeholder="请输入条码、名称、助记码、规格、型号等信息"
+                    placeholder="请输入SKU、名称、助记码、规格、型号等信息"
                     v-model="queryParam.materialParam"
                   ></a-input>
                 </a-form-item>
@@ -79,6 +79,7 @@
                     <a-select placeholder="请选择单据状态" v-model="queryParam.status">
                       <a-select-option value="0">未审核</a-select-option>
                       <a-select-option value="9" v-if="!checkFlag">审核中</a-select-option>
+                      <a-select-option value="8">审核不通过</a-select-option>
                       <a-select-option value="1">已审核</a-select-option>
                       <a-select-option value="3">部分销售</a-select-option>
                       <a-select-option value="2">完成销售</a-select-option>
@@ -176,6 +177,7 @@
               <a-tag v-if="status == '2'" color="cyan">完成销售</a-tag>
               <a-tag v-if="status == '3'" color="blue">部分销售</a-tag>
               <a-tag v-if="status == '4'" color="blue">进行中</a-tag>
+              <a-tag v-if="status == '8'" color="red">审核不通过</a-tag>
               <a-tag v-if="status == '9'" color="orange">审核中</a-tag>
             </template>
             <template slot="customRenderPurchaseStatus" slot-scope="purchaseStatus">

jshERP-web/src/views/bill/SaleOutList.vue

@@ -16,7 +16,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input
-                    placeholder="请输入条码、名称、助记码、规格、型号等信息"
+                    placeholder="请输入SKU、名称、助记码、规格、型号等信息"
                     v-model="queryParam.materialParam"
                   ></a-input>
                 </a-form-item>
@@ -120,6 +120,7 @@
                     <a-select placeholder="请选择单据状态" v-model="queryParam.status">
                       <a-select-option value="0">未审核</a-select-option>
                       <a-select-option value="9" v-if="!checkFlag">审核中</a-select-option>
+                      <a-select-option value="8">审核不通过</a-select-option>
                       <a-select-option value="1">已审核</a-select-option>
                       <a-select-option value="3">部分出库</a-select-option>
                       <a-select-option value="2">完成出库</a-select-option>
@@ -226,6 +227,7 @@
               <a-tag v-if="status == '1'" color="green">已审核</a-tag>
               <a-tag v-if="status == '2'" color="cyan">完成出库</a-tag>
               <a-tag v-if="status == '3'" color="blue">部分出库</a-tag>
+              <a-tag v-if="status == '8'" color="red">审核不通过</a-tag>
               <a-tag v-if="status == '9'" color="orange">审核中</a-tag>
             </template>
           </a-table>

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

@@ -11,7 +11,7 @@
     @cancel="handleCancel"
     wrapClassName="ant-modal-cust-warp"
   >
-    <template slot="footer">
+    <template slot="footer" v-if="!approvalId">
       <!--打印-->
       <a-button key="back" @click="handleCancel">取消(ESC)</a-button>
       <template v-if="isShowPrintBtn">
@@ -34,7 +34,7 @@
         <a-button v-if="billType === '盘点复盘'" v-print="'#stockCheckReplayPrint'">普通打印</a-button>
       </template>
       <!--导出Excel-->
-      <a-button v-if="billType === '零售出库' || billType === '零售退货入库'" @click="retailExportExcel()"
+      <!-- <a-button v-if="billType === '零售出库' || billType === '零售退货入库'" @click="retailExportExcel()"
         >导出</a-button
       >
       <a-button v-if="billType === '请购单'" @click="applyExportExcel()">导出</a-button>
@@ -52,9 +52,14 @@
       <a-button v-if="billType === '其它入库' || billType === '其它出库'" @click="otherExportExcel()">导出</a-button>
       <a-button v-if="billType === '调拨出库'" @click="allocationOutExportExcel()">导出</a-button>
       <a-button v-if="billType === '组装单' || billType === '拆卸单'" @click="assembleExportExcel()">导出</a-button>
-      <a-button v-if="billType === '盘点复盘'" @click="stockCheckReplayExportExcel()">导出</a-button>
+      <a-button v-if="billType === '盘点复盘'" @click="stockCheckReplayExportExcel()">导出</a-button> -->
       <!--反审核-->
-      <a-button v-if="checkFlag && isCanBackCheck && model.status === '1'" @click="handleBackCheck()">反审核</a-button>
+      <!-- <a-button v-if="checkFlag && isCanBackCheck && model.status === '1'" @click="handleBackCheck()">反审核</a-button> -->
+    </template>
+    <template slot="footer" v-else>
+      <a-button v-if="!approvalIsReadonly" :loading="confirmLoading" @click="submitApproval(2)">审核不通过</a-button>
+      <a-button type="primary" v-if="!approvalIsReadonly" :loading="confirmLoading" @click="submitApproval(1)">审核通过</a-button>
+      <a-button key="back" v-if="approvalIsReadonly" @click="handleCancel">取消(ESC)</a-button>
     </template>
     <a-form :form="form">
       <!--零售出库-->
@@ -1902,7 +1907,7 @@
           <a-col :span="14"></a-col>
         </a-row>
       </template>
-      <template v-if="fileList && fileList.length > 0">
+      <template v-if="voucherPictureList && voucherPictureList.length > 0">
         <a-row class="form-row" :gutter="24">
           <a-col :span="10">
             <a-form-item
@@ -1917,6 +1922,22 @@
         </a-row>
       </template>
     </a-form>
+    <!-- 审批历史 -->
+     <section v-if="approvalId">
+      <h4 class="block-title">审批历史</h4>
+      <a-table 
+        size="middle"
+        bordered
+        rowKey="id"
+        :pagination="false"
+        :loading="approval.loading"
+        :columns="approval.columns"
+        :rowClassName="rowClassName"
+        :dataSource="approval.dataSource"
+        :scroll="{ x: '100%' }"
+      ></a-table>
+      <a-textarea :rows="1" placeholder="审核备注" v-model="auditComment" v-if="!approvalIsReadonly" style="margin-top: 8px" />
+     </section>
     <bill-print-iframe ref="modalDetail"></bill-print-iframe>
     <financial-detail ref="financialDetailModal"></financial-detail>
   </j-modal>
@@ -1936,7 +1957,8 @@ import BillPrintIframe from './BillPrintIframe'
 import FinancialDetail from '../../financial/dialog/FinancialDetail'
 import JUpload from '@/components/jeecg/JUpload'
 import JEllipsis from '@/components/jeecg/JEllipsis'
-import Vue from 'vue'
+import Vue, { isReadonly } from 'vue'
+import { mapGetters } from 'vuex'
 // import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 // import QrcodeVue from 'qrcode.vue'
 // import VueQr from 'vue-qr'
@@ -1952,6 +1974,9 @@ export default {
     JEllipsis
     // VueQr,
   },
+  computed:{
+    ...mapGetters(['username'])
+  },
   data() {
     return {
       title: '详情',
@@ -2014,7 +2039,6 @@ export default {
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '批号', dataIndex: 'batchNumber' },
         { title: '有效期', dataIndex: 'expirationDate' },
-        { title: '多属性', dataIndex: 'sku' },
         { title: '数量', dataIndex: 'operNumber' },
         { title: '单价', dataIndex: 'unitPrice' },
         { title: '金额', dataIndex: 'allPrice' },
@@ -2037,7 +2061,6 @@ export default {
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '批号', dataIndex: 'batchNumber' },
         { title: '有效期', dataIndex: 'expirationDate' },
-        { title: '多属性', dataIndex: 'sku' },
         { title: '数量', dataIndex: 'operNumber' },
         { title: '单价', dataIndex: 'unitPrice' },
         { title: '金额', dataIndex: 'allPrice' },
@@ -2055,7 +2078,6 @@ export default {
         { title: '制造商', dataIndex: 'mfrs' },
         { title: '扩展信息', dataIndex: 'materialOther' },
         { title: '单位', dataIndex: 'unit' },
-        { title: '多属性', dataIndex: 'sku' },
         { title: '数量', dataIndex: 'operNumber' },
         { title: '已采购', dataIndex: 'finishNumber' },
         { title: '备注', dataIndex: 'remark' },
@@ -2076,11 +2098,10 @@ export default {
         { title: '品牌', dataIndex: 'brand', width: 90 },
         { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
-        { title: '库存', dataIndex: 'inventory', width: 90 },
+        { title: '库存', dataIndex: 'stock', width: 90 },
         { title: '单位', dataIndex: 'unit', width: 90 },
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '有效期', dataIndex: 'expirationDate', width: 90 },
-        { title: '多属性', dataIndex: 'sku', width: 90 },
         { title: '入库数量', dataIndex: 'operNumber', width: 90 },
         { title: '已入库', dataIndex: 'finishNumber', width: 90 },
         { title: '单价', dataIndex: 'unitPrice', width: 90 },
@@ -2110,11 +2131,10 @@ export default {
         { title: '品牌', dataIndex: 'brand', width: 90 },
         { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
-        { title: '库存', dataIndex: 'inventory', width: 90 },
+        { title: '库存', dataIndex: 'stock', width: 90 },
         { title: '单位', dataIndex: 'unit', width: 90 },
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '有效期', dataIndex: 'expirationDate', width: 90 },
-        { title: '多属性', dataIndex: 'sku', width: 90 },
         { title: '入库数量', dataIndex: 'operNumber', width: 90 },
         { title: '已入库', dataIndex: 'finishNumber', width: 90 },
         { title: '单价', dataIndex: 'unitPrice', width: 90 },
@@ -2142,7 +2162,6 @@ export default {
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '批号', dataIndex: 'batchNumber' },
         { title: '有效期', dataIndex: 'expirationDate' },
-        { title: '多属性', dataIndex: 'sku' },
         { title: '数量', dataIndex: 'operNumber' },
         { title: '已出库', dataIndex: 'finishNumber' },
         { title: '单价', dataIndex: 'unitPrice' },
@@ -2170,11 +2189,10 @@ export default {
         { title: '品牌', dataIndex: 'brand', width: 90 },
         { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
-        { title: '库存', dataIndex: 'inventory', width: 90 },
+        { title: '库存', dataIndex: 'stock', width: 90 },
         { title: '单位', dataIndex: 'unit', width: 90 },
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '有效期', dataIndex: 'expirationDate', width: 90 },
-        { title: '多属性', dataIndex: 'sku', width: 90 },
         { title: '出库数量', dataIndex: 'operNumber', width: 90 },
         { title: '已出库', dataIndex: 'finishNumber', width: 90 },
         { title: '单价', dataIndex: 'unitPrice', width: 90 },
@@ -2204,11 +2222,10 @@ export default {
         { title: '品牌', dataIndex: 'brand', width: 90 },
         { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
-        { title: '库存', dataIndex: 'inventory', width: 90 },
+        { title: '库存', dataIndex: 'stock', width: 90 },
         { title: '单位', dataIndex: 'unit', width: 90 },
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '有效期', dataIndex: 'expirationDate', width: 90 },
-        { title: '多属性', dataIndex: 'sku', width: 90 },
         { title: '出库数量', dataIndex: 'operNumber', width: 90 },
         { title: '已出库', dataIndex: 'finishNumber', width: 90 },
         { title: '单价', dataIndex: 'unitPrice', width: 90 },
@@ -2236,7 +2253,6 @@ export default {
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '批号', dataIndex: 'batchNumber' },
         { title: '有效期', dataIndex: 'expirationDate' },
-        { title: '多属性', dataIndex: 'sku' },
         { title: '数量', dataIndex: 'operNumber' },
         { title: '已入库', dataIndex: 'finishNumber' },
         { title: '单价', dataIndex: 'unitPrice' },
@@ -2265,11 +2281,10 @@ export default {
         { title: '品牌', dataIndex: 'brand', width: 90 },
         { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
-        { title: '库存', dataIndex: 'inventory', width: 90 },
+        { title: '库存', dataIndex: 'stock', width: 90 },
         { title: '单位', dataIndex: 'unit', width: 90 },
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '有效期', dataIndex: 'expirationDate', width: 90 },
-        { title: '多属性', dataIndex: 'sku', width: 90 },
         { title: '入库数量', dataIndex: 'operNumber', width: 90 },
         { title: '单价', dataIndex: 'unitPrice', width: 90 },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
@@ -2292,11 +2307,10 @@ export default {
         { title: '品牌', dataIndex: 'brand', width: 90 },
         { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
-        { title: '库存', dataIndex: 'inventory', width: 90 },
+        { title: '库存', dataIndex: 'stock', width: 90 },
         { title: '单位', dataIndex: 'unit', width: 90 },
         { title: '序列号', dataIndex: 'snList', width: 300 },
         { title: '有效期', dataIndex: 'expirationDate', width: 90 },
-        { title: '多属性', dataIndex: 'sku', width: 90 },
         { title: '出库数量', dataIndex: 'operNumber', width: 90 },
         { title: '单价', dataIndex: 'unitPrice', width: 90 },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
@@ -2323,10 +2337,9 @@ export default {
         { title: '品牌', dataIndex: 'brand', width: 90 },
         { title: '制造商', dataIndex: 'mfrs', width: 90 },
         { title: '扩展信息', dataIndex: 'materialOther', width: 90 },
-        { title: '库存', dataIndex: 'inventory', width: 90 },
+        { title: '库存', dataIndex: 'stock', width: 90 },
         { title: '调入仓库', dataIndex: 'anotherDepotName' },
         { title: '单位', dataIndex: 'unit', width: 90 },
-        { title: '多属性', dataIndex: 'sku' },
         { title: '数量', dataIndex: 'operNumber', width: 90 },
         { title: '单价', dataIndex: 'unitPrice', width: 90 },
         { title: '金额', dataIndex: 'allPrice', width: 90 },
@@ -2351,7 +2364,6 @@ export default {
         { title: '扩展信息', dataIndex: 'materialOther' },
         { title: '库存', dataIndex: 'stock' },
         { title: '单位', dataIndex: 'unit' },
-        { title: '多属性', dataIndex: 'sku' },
         { title: '数量', dataIndex: 'operNumber' },
         { title: '单价', dataIndex: 'unitPrice' },
         { title: '金额', dataIndex: 'allPrice' },
@@ -2370,7 +2382,6 @@ export default {
         { title: '扩展信息', dataIndex: 'materialOther' },
         { title: '库存', dataIndex: 'stock' },
         { title: '单位', dataIndex: 'unit' },
-        { title: '多属性', dataIndex: 'sku' },
         { title: '数量', dataIndex: 'operNumber' },
         { title: '单价', dataIndex: 'unitPrice' },
         { title: '金额', dataIndex: 'allPrice' },
@@ -2387,12 +2398,43 @@ export default {
         { title: '扩展信息', dataIndex: 'materialOther' },
         { title: '库存', dataIndex: 'stock' },
         { title: '单位', dataIndex: 'unit' },
-        { title: '多属性', dataIndex: 'sku' },
         { title: '数量', dataIndex: 'operNumber' },
         { title: '单价', dataIndex: 'unitPrice' },
         { title: '金额', dataIndex: 'allPrice' },
         { title: '备注', dataIndex: 'remark' },
       ],
+
+      // 审批历史
+      confirmLoading: false,
+      approvalId: null,
+      approvalIsReadonly: false,
+      approval:{
+        loading:false,
+        columns:[
+          { title: '审核时间', dataIndex: 'auditTime' },
+          { title: '审核环节', dataIndex: 'nodeOrder',customRender(text,record,index){
+            if(index===0){
+              return text
+            }
+            return `审批节点${text}`
+          } },
+          { title: '审批人', dataIndex: 'auditorName' },
+          { title: '审核动作', dataIndex: 'auditResult',customRender(text,record,index){
+            if(index===0){
+              return text
+            }
+            if(text==1){
+              return '审批通过'
+            }else if(text==2){
+              return '审批不通过'
+            }
+            return ''
+          } },
+          { title: '备注', dataIndex: 'auditComment' },
+        ],
+        dataSource:[]
+      },
+      auditComment: ''
     }
   },
   created() {
@@ -2598,7 +2640,14 @@ export default {
         }
       })
     },
-    show(record, type, prefixNo) {
+    rowClassName(record,index){
+      if(this.username===record.auditorName){
+        return 'red-row'
+      }
+      return ''
+    },
+    show(record, type, prefixNo, approvalRow=null) {
+      console.log('this.username',this.username)
       //查询单条单据信息
       findBillDetailByNumber({ number: record.number }).then((res) => {
         console.log('findBillDetailByNumber-----------',res)
@@ -2617,12 +2666,6 @@ export default {
           } else {
             this.model.getAmount = this.model.changeAmount
           }
-          // this.model.debt = (
-          //   this.model.discountLastMoney +
-          //   this.model.otherMoney -
-          //   (this.model.deposit + this.model.changeAmount)
-          // ).toFixed(2)
-          this.model.debt = item.debt
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model, 'id'))
           })
@@ -2661,6 +2704,22 @@ export default {
           this.getFinancialBillNoByBillId(this.model.id)
         }
       })
+      //审批历史
+      if(approvalRow&&approvalRow.id){
+        this.approvalId = approvalRow.id
+        getAction('/audit/auditHistory',{id:approvalRow.id}).then(res => {
+          const list = res.data
+          list.unshift({
+            auditTime: approvalRow.submitTime,
+            nodeOrder: '开始',
+            auditorName: approvalRow.initiatorName,
+            auditResult: '提交审批',
+            auditComment: '',
+          })
+          this.approval.dataSource = list
+          console.log('approvalRow=====',approvalRow)
+        })
+      }
     },
     requestSubTableData(record, type, url, params, success) {
       this.loading = true
@@ -2705,6 +2764,9 @@ export default {
       this.$emit('close')
       this.visible = false
       this.modalStyle = ''
+      this.approvalId = null
+      this.approvalIsReadonly = false
+      this.approval.dataSource = []
     },
     myHandleDetail(billNumber) {
       findBillDetailByNumber({ number: billNumber }).then((res) => {
@@ -3059,6 +3121,25 @@ export default {
       let columnsStr = checkedValues.join()
       Vue.ls.set(`${this.prefixNo}_XQ`, columnsStr)
     },
+    submitApproval(status){
+      const params = {
+        id: this.approvalId,
+        status,
+        auditComment: this.auditComment
+      }
+      this.confirmLoading = true
+      postAction('/audit/setStatus',params).then(res => {
+        console.log(res)
+        if(res.code==200&&res.data){
+          this.$message.success(res.msg)
+          this.handleCancel()
+        }else{
+          this.$message.error(res.msg||'操作失败')
+        }
+      }).finally(() => {
+       this.confirmLoading = false
+      })
+    }
   },
 }
 </script>
@@ -3081,4 +3162,12 @@ export default {
 .table-operator {
   margin-bottom: 18px;
 }
+
+.block-title{
+  font-size: 16px;
+  margin-bottom: 10px;
+}
+::v-deep .red-row{
+  color: #f5222d;
+}
 </style>

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

@@ -42,7 +42,7 @@
             </a-col>
             <a-col :md="5" :sm="24">
               <a-form-item label="商品" :labelCol="{ span: 5 }" :wrapperCol="{ span: 18, offset: 1 }">
-                <a-input placeholder="条码|名称|规格|型号" v-model="queryParam.materialParam"></a-input>
+                <a-input placeholder="SKU|名称|规格|型号" v-model="queryParam.materialParam"></a-input>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">

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

@@ -26,7 +26,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="商品信息" :labelCol="{ span: 5 }" :wrapperCol="{ span: 18, offset: 1 }">
-                <a-input placeholder="条码|名称|规格|型号" v-model="queryParam.materialParam"></a-input>
+                <a-input placeholder="SKU|名称|规格|型号" v-model="queryParam.materialParam"></a-input>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -209,7 +209,7 @@ export default {
         },
       ],
       columnsDetail: [
-        { title: '条码', dataIndex: 'barCode', width: 120 },
+        { title: 'SKU', dataIndex: 'sku', width: 120 },
         { title: '名称', dataIndex: 'name', width: 100, ellipsis: true },
         { title: '规格', dataIndex: 'standard', width: 100, ellipsis: true },
         { title: '型号', dataIndex: 'model', width: 150, ellipsis: true },
@@ -381,6 +381,7 @@ export default {
           if (res.code === 200) {
             let list = res.data.rows
             let listEx = []
+            console.log('listEx', listEx)
             for (let j = 0; j < list.length; j++) {
               let info = list[j]
               if (info.finishNumber < info.preNumber) {

jshERP-web/src/views/bill/mixins/BillModalMixin.js

@@ -78,14 +78,6 @@ export const BillModalMixin = {
     this.width = realScreenWidth < 1500 ? '1200px' : '1550px'
     this.minWidth = realScreenWidth < 1500 ? 1150 : 1500
   },
-  watch:{
-    $route(to, from) {
-      if(this.handleCancel){
-        this.handleCancel()
-      }
-      this.visible = false
-    }
-  },
   mounted() {
     document.getElementById(this.prefixNo).addEventListener('keydown', this.handleOkKey)
     this.getCreatorSpinnerList()
@@ -158,15 +150,6 @@ export const BillModalMixin = {
         .then((res) => {
           if (res && res.code === 200) {
             tab.dataSource = res.data.rows
-            for (let i = 0; i < tab.dataSource.length; i++) {
-              let info = tab.dataSource[i]
-              info.isEdit = this.model.id ? 1 : 0
-              if (info.unitId) {
-                info.unitList = JSON.stringify(info.unitList)
-              }
-
-              this.changeColumnShow(info)
-            }
             typeof success === 'function' ? success(res) : ''
           }
         })
@@ -470,7 +453,7 @@ export const BillModalMixin = {
             const {position='',stock=0} = res.data
             updateRows.push({
               rowKey: row.id,
-              values: { position:position,inventory: stock, stock,depotId },
+              values: { position:position,stock,depotId },
             })
           }
         }
@@ -478,54 +461,64 @@ export const BillModalMixin = {
         target.$forceUpdate()
       })
     },
+    handleSelectMaterial({rows,target,index,value}){
+      console.log('handleSelectMaterial',rows)
+      console.log('target',target)
+      const param = {
+        sku: rows.map(item => item.sku).join(','),
+        organId: this.form.getFieldValue('organId'),
+        prefixNo: this.prefixNo,
+      }
+      const formDepotId = this.form.getFieldValue('depotId')
+      const formTaxRate = this.form.getFieldValue('taxRate')
+      getMaterialBySku(param).then(async (res) => {
+        if (res && res.code === 200) {
+          let mList = res.data
+          let mArr = await target.getValuesPromise(false)
+          const preSkuList = mArr.map(item => item.sku)
+          const newList = mList.filter(item => !preSkuList.includes(item.sku)) // 新sku
+          if(newList.length===0){
+            this.$message.warning('此列表已存在选择的sku')
+            return
+          }
+          for(let i = 0; i < newList.length; i++){
+            const rawInfo = newList[i]
+            const mObj = this.parseInfoToObj(rawInfo)
+            const ratio = mObj.ratio || 1
+            mObj.allPrice = ((mObj.unitPrice - 0)* ratio* (mObj.operNumber)).toFixed(2) - 0
+            mObj.taxRate = formTaxRate || 0
+            mObj.taxMoney = (mObj.taxRate * 0.01 * mObj.allPrice).toFixed(2) - 0
+            mObj.taxLastMoney = (mObj.allPrice + mObj.taxMoney).toFixed(2)
+            mObj.depotId = formDepotId
+            mObj.position = ''
+            if(formDepotId){
+              const res = await findStockByDepotAndSku({ depotId: formDepotId, sku: mObj.sku })
+              const {position='',stock=0} = res.data
+              mObj.stock = stock
+              mObj.position = position
+            }
+            if(!value&&i==0){
+              mArr[index] = mObj
+            }else{
+              mArr.splice(index,0,mObj)
+            }
+          }
+          this.materialTable.dataSource = mArr
+          target.$nextTick(() => {
+            target.recalcAllStatisticsColumns()
+            setTimeout(() => {
+              this.autoChangePrice(target)
+            },100)
+          })
+        }
+      })
+    },
     //单元值改变一个字符就触发一次
     onValueChange(event) {
       let that = this
-      const { type, row, column, value, target } = event
-      let param, snList, batchNumber, operNumber, unitPrice, allPrice, taxRate, taxMoney, taxLastMoney,ratio
+      const { row, column, value, target } = event
+      let snList, operNumber, unitPrice, allPrice, taxRate, taxMoney, taxLastMoney,ratio
       switch (column.key) {
-        case 'sku':
-          param = {
-            sku: value,
-            organId: this.form.getFieldValue('organId'),
-            prefixNo: this.prefixNo,
-          }
-          const formDepotId = that.form.getFieldValue('depotId')
-          const formTaxRate = that.form.getFieldValue('taxRate')
-          getMaterialBySku(param).then(async (res) => {
-            if (res && res.code === 200) {
-              let mList = res.data
-              let mArr = await target.getValuesPromise(false)
-              const clickRowIndex = mArr.findIndex(item => item.id === row.id)
-              for(let i = 0; i < mList.length; i++){
-                const rawInfo = mList[i]
-                const mObj = that.parseInfoToObj(rawInfo)
-                const ratio = mObj.ratio || 1
-                mObj.allPrice = ((mObj.unitPrice - 0)* ratio* (mObj.operNumber))
-                mObj.taxRate = formTaxRate || 0
-                mObj.taxMoney = (mObj.taxRate * 0.01 * mObj.allPrice).toFixed(2) - 0
-                mObj.taxLastMoney = (mObj.allPrice + mObj.taxMoney)
-                mObj.depotId = formDepotId
-                mObj.position = ''
-                if(formDepotId){
-                  const res = await findStockByDepotAndSku({ depotId: formDepotId, sku: mObj.sku })
-                  const {position='',stock=0} = res.data
-                  mObj.stock = stock
-                  mObj.inventory = stock
-                  mObj.position = position
-                }
-                mArr.splice(clickRowIndex,0,mObj)
-              }
-              this.materialTable.dataSource = mArr.filter(item => item.id !== row.id)
-              target.$nextTick(() => {
-                target.recalcAllStatisticsColumns()
-                setTimeout(() => {
-                  that.autoChangePrice(target)
-                },100)
-              })
-            }
-          })
-          break
         case 'snList':
           snList = value
           if (snList) {
@@ -606,7 +599,7 @@ export const BillModalMixin = {
         unitId: mInfo.unitId,
         unitList: mInfo.unitList,
         depotId: mInfo.depotId,
-        inventory: mInfo.inventory,
+        stock: mInfo.stock,
         ratio: mInfo.ratio,
       }
     },
@@ -634,9 +627,6 @@ export const BillModalMixin = {
       if (info.materialOther) {
         this.changeFormTypes(this.materialTable.columns, 'materialOther', 1)
       }
-      if (info.sku) {
-        this.changeFormTypes(this.materialTable.columns, 'sku', 1)
-      }
       if (info.enableSerialNumber === '1') {
         //如果开启出入库管理，并且类型等于采购、采购退货、销售、销售退货，则跳过
         if (
@@ -1016,7 +1006,7 @@ export const BillModalMixin = {
     },
     //保存并审核
     handleOkAndCheck() {
-      this.billStatus = '1'
+      this.billStatus = '9'
       this.handleOk()
     },
     //发起流程

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

@@ -23,8 +23,8 @@
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="供应商">
               <a-select
                 placeholder="请选择供应商"
@@ -53,17 +53,17 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
               <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
               <a-input placeholder="请输入单据编号" v-decorator.trim="['number']" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -76,7 +76,7 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -85,7 +85,7 @@
               <a-input placeholder="自动带出" disabled v-decorator="['taxRate']" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               v-if="inOutManageFlag && !model.billType"
               :labelCol="labelCol"
@@ -107,7 +107,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
-          :minWidth="minWidth"
+          minWidth="100%"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="rowCanEdit"
@@ -116,7 +116,6 @@
           @valueChange="onValueChange"
           @added="onAdded"
           @deleted="onDeleted"
-          @focusChange="getUnitInfo"
         >
           <template #buttonAfter>
             <a-row
@@ -149,6 +148,7 @@
           <template #depotId="{ value }">
             <a-select
               disabled
+              :showArrow="false"
               :value="value"
               :options="depotList"
             >
@@ -168,26 +168,6 @@
               </a-tooltip>
             </a-input>
           </template>
-          <!-- <template #depotBatchSet>
-            <a-icon type="down" @click="handleBatchSetDepot" />
-          </template> -->
-          <template #unit="{ handleChange, handleFocus, value }">
-            <a-select
-              placeholder="请选择"
-              v-decorator="['unit']"
-              :dropdownMatchSelectWidth="false"
-              showSearch
-              :allowClear="false"
-              optionFilterProp="children"
-              :value="value"
-              @change="($event) => handleChange($event)"
-              @focus="($event) => handleFocus($event)"
-            >
-              <a-select-option v-for="(item, index) in unitList" :key="index" :value="item.name">
-                {{ item.name }}
-              </a-select-option>
-            </a-select>
-          </template>
           <template #warehousingUser="{ handleChange, value }">
             <a-select
               placeholder="请选择"
@@ -202,23 +182,26 @@
             >
             </a-select>
           </template>
+          <template #sku="{ value, index, target,rowId }">
+            <JSelectMaterial :value="value" @change="($event) => handleSelectMaterial({...$event,target,rowId,index,value})"></JSelectMaterial>
+          </template>
         </j-editable-table>
-        <a-row class="form-row" :gutter="24">
+        <a-row class="form-row" :gutter="24" type="flex">
           <a-col :lg="24" :md="24" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="{ xs: { span: 24 }, sm: { span: 24 } }" label="">
               <a-textarea :rows="1" placeholder="请输入备注" v-decorator="['remark']" style="margin-top: 8px" />
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
               <j-upload v-model="fileList" bizPath="bill"></j-upload>
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -259,6 +242,7 @@ import JDate from '@/components/jeecg/JDate'
 import Vue from 'vue'
 import WaitBillList from '../dialog/WaitBillList'
 import JImageUpload from '@/components/jeecg/JImageUpload.vue'
+import JSelectMaterial from '@/components/jeecgbiz/JSelectMaterial'
 
 export default {
   name: 'OtherInModal',
@@ -274,6 +258,7 @@ export default {
     JUpload,
     JImageUpload,
     JDate,
+    JSelectMaterial,
     VNodes: {
       functional: true,
       render: (h, ctx) => ctx.props.vnodes,
@@ -312,13 +297,12 @@ export default {
           {
             title: 'SKU',
             key: 'sku',
-            width: '200px',
-            type: FormTypes.popupJsh,
-            kind: 'material',
-            multi: true,
+            width: '280px',
+            type: FormTypes.slot,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '名称', key: 'name', width: '120px', type: FormTypes.normal },
+          { title: '规格', key: 'standard', width: '120px', type: FormTypes.normal },
           {
             title: '生产日期',
             key: 'productionDate',
@@ -330,11 +314,6 @@ export default {
           { title: '仓库名', key: 'depotId', width: '120px', type: FormTypes.slot},
           { title: '仓库货架', key: 'position', width: '120px', type: FormTypes.input },
           { title: '包装规格', key: 'unitName', width: '120px', type: FormTypes.normal },
-
-          { title: '型号', key: 'model', width: '120px', type: FormTypes.normal },
-          { title: '颜色', key: 'color', width: '120px', type: FormTypes.normal },
-          { title: '品牌', key: 'brand', width: '120px', type: FormTypes.normal },
-          { title: '制造商', key: 'mfrs', width: '120px', type: FormTypes.normal },
           { title: '扩展信息', key: 'materialOther', width: '120px', type: FormTypes.normal },
           { title: '库存', key: 'stock', width: '120px', type: FormTypes.normal },
           {
@@ -343,32 +322,23 @@ 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: '单位id', key: 'unitId', width: '120px', type: FormTypes.hidden },
-          { title: '单位列表', key: 'unitList', width: '120px', type: FormTypes.hidden },
-          { title: '序列号', key: 'snList', width: '120px', type: FormTypes.popupJsh, kind: 'snAdd', multi: true },
-          { title: '有效期', key: 'expirationDate', width: '120px', type: FormTypes.date },
-          { title: '多属性', key: 'sku', width: '120px', type: FormTypes.normal },
-          { title: '原数量', key: 'preNumber', width: '120px', type: FormTypes.normal },
-          { title: '已入库', key: 'finishNumber', width: '120px', type: FormTypes.normal },
+          
           {
             title: '入库数量',
             key: 'operNumber',
             width: '120px',
             type: FormTypes.inputNumber,
-            statistics: true,
             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: '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: 'allPrice', width: '120px', type: FormTypes.inputNumber,disabled: true, statistics: true },
-          { title: '入库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.hidden },
-          { title: '入库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.hidden },
           {
             title: '入库人',
             key: 'warehousingUser',
@@ -414,13 +384,6 @@ export default {
     editAfter() {
       this.billStatus = '0'
       this.rowCanEdit = true
-      this.materialTable.columns[0].type = FormTypes.popupJsh
-      this.changeColumnHide()
-      this.changeFormTypes(this.materialTable.columns, 'snList', 0)
-      // this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
-      this.changeFormTypes(this.materialTable.columns, 'expirationDate', 0)
-      this.changeFormTypes(this.materialTable.columns, 'preNumber', 0)
-      this.changeFormTypes(this.materialTable.columns, 'finishNumber', 0)
       if (this.action === 'add') {
         this.addInit(this.prefixNo)
         this.fileList = []
@@ -512,8 +475,6 @@ export default {
     waitBillListOk(selectBillDetailRows, linkNumber, remark, organId) {
       this.rowCanEdit = false
       this.materialTable.columns[1].type = FormTypes.normal
-      this.changeFormTypes(this.materialTable.columns, 'preNumber', 1)
-      this.changeFormTypes(this.materialTable.columns, 'finishNumber', 1)
       if (selectBillDetailRows && selectBillDetailRows.length > 0) {
         let listEx = []
         for (let j = 0; j < selectBillDetailRows.length; j++) {
@@ -525,7 +486,6 @@ export default {
           info.allPrice = 0
           info.linkId = info.id
           listEx.push(info)
-          this.changeColumnShow(info)
         }
         this.materialTable.dataSource = listEx
         this.$nextTick(() => {
@@ -537,9 +497,6 @@ export default {
         })
       }
     },
-    getUnitInfo(val) {
-      this.unitList = val
-    },
   },
 }
 </script>

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

@@ -23,8 +23,8 @@
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="客户">
               <a-select
                 placeholder="请选择客户"
@@ -53,17 +53,17 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
               <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据编号">
               <a-input placeholder="请输入单据编号" v-decorator.trim="['number']" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -76,7 +76,7 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -85,7 +85,7 @@
               <a-input placeholder="自动带出" disabled v-decorator="['taxRate']" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               v-if="inOutManageFlag && !model.billType"
               :labelCol="labelCol"
@@ -107,7 +107,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
-          :minWidth="minWidth"
+          minWidth="100%"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="rowCanEdit"
@@ -116,7 +116,6 @@
           @valueChange="onValueChange"
           @added="onAdded"
           @deleted="onDeleted"
-          @focusChange="getUnitInfo"
         >
           <template #buttonAfter>
             <a-row
@@ -149,6 +148,7 @@
           <template #depotId="{ value }">
             <a-select
               disabled
+              :showArrow="false"
               :value="value"
               :options="depotList"
             >
@@ -168,32 +168,6 @@
               </a-tooltip>
             </a-input>
           </template>
-          <!-- <template #depotBatchSet>
-            <a-icon type="down" @click="handleBatchSetDepot" />
-          </template> -->
-          <!-- <template #depotAdd>
-            <a-divider v-if="quickBtn.depot" style="margin: 4px 0" />
-            <div v-if="quickBtn.depot" style="padding: 4px 8px; cursor: pointer" @click="addDepot">
-              <a-icon type="plus" /> 新增仓库
-            </div>
-          </template> -->
-          <template #unit="{ handleChange, handleFocus, value }">
-            <a-select
-              placeholder="请选择"
-              v-decorator="['unit']"
-              :dropdownMatchSelectWidth="false"
-              showSearch
-              :allowClear="false"
-              optionFilterProp="children"
-              :value="value"
-              @change="($event) => handleChange($event)"
-              @focus="($event) => handleFocus($event)"
-            >
-              <a-select-option v-for="(item, index) in unitList" :key="index" :value="item.name">
-                {{ item.name }}
-              </a-select-option>
-            </a-select>
-          </template>
           <template #warehousingUser="{ handleChange, value }">
             <a-select
               placeholder="请选择"
@@ -208,23 +182,26 @@
             >
             </a-select>
           </template>
+          <template #sku="{ value, index, target,rowId }">
+            <JSelectMaterial :value="value" @change="($event) => handleSelectMaterial({...$event,target,rowId,index,value})"></JSelectMaterial>
+          </template>
         </j-editable-table>
-        <a-row class="form-row" :gutter="24">
+        <a-row class="form-row" :gutter="24" type="flex">
           <a-col :lg="24" :md="24" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="{ xs: { span: 24 }, sm: { span: 24 } }" label="">
               <a-textarea :rows="1" placeholder="请输入备注" v-decorator="['remark']" style="margin-top: 8px" />
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="附件">
               <j-upload v-model="fileList" bizPath="bill"></j-upload>
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -265,6 +242,7 @@ import JDate from '@/components/jeecg/JDate'
 import Vue from 'vue'
 import WaitBillList from '../dialog/WaitBillList'
 import JImageUpload from '@/components/jeecg/JImageUpload.vue'
+import JSelectMaterial from '@/components/jeecgbiz/JSelectMaterial'
 
 export default {
   name: 'OtherOutModal',
@@ -280,6 +258,7 @@ export default {
     JUpload,
     JImageUpload,
     JDate,
+    JSelectMaterial,
     VNodes: {
       functional: true,
       render: (h, ctx) => ctx.props.vnodes,
@@ -318,53 +297,33 @@ export default {
           {
             title: 'SKU',
             key: 'sku',
-            width: '200px',
-            type: FormTypes.popupJsh,
-            kind: 'material',
-            multi: true,
-            newBatch: true,
+            width: '280px',
+            type: FormTypes.slot,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '名称', key: 'name', width: '120px', type: FormTypes.normal },
-          // { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
+          { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
           { title: '仓库名', key: 'depotId', width: '120px', type: FormTypes.slot,validateRules: [{ required: true, message: '${title}不能为空' }], },
           { title: '仓库货架', key: 'position', width: '120px', type: FormTypes.input },
           { title: '包装规格', key: 'unitName', width: '120px', type: FormTypes.normal },
 
-          { title: '型号', key: 'model', width: '120px', type: FormTypes.normal },
-          { title: '颜色', key: 'color', width: '120px', type: FormTypes.normal },
-          { title: '品牌', key: 'brand', width: '120px', type: FormTypes.normal },
-          { title: '制造商', key: 'mfrs', width: '120px', type: FormTypes.normal },
-          { title: '扩展信息', key: 'materialOther', width: '120px', type: FormTypes.normal },
           { title: '库存', key: 'stock', width: '120px', type: FormTypes.normal },
           {
             title: '单位',
             key: 'unit',
             width: '120px',
             type: FormTypes.normal,
-            // options: [],
-            // allowClear: false,
-            // slotName: 'unit',
           },
           { 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: '单位id', key: 'unitId', width: '120px', type: FormTypes.hidden },
-          { title: '单位列表', key: 'unitList', width: '120px', type: FormTypes.hidden },
-          { title: '序列号', key: 'snList', width: '120px', type: FormTypes.popupJsh, kind: 'sn', multi: true },
-          { title: '多属性', key: 'sku', width: '120px', type: FormTypes.normal },
-          { title: '原数量', key: 'preNumber', width: '120px', type: FormTypes.normal },
-          { title: '已入库', key: 'finishNumber', width: '120px', type: FormTypes.normal },
           {
             title: '出库数量',
             key: 'operNumber',
             width: '120px',
             type: FormTypes.inputNumber,
-            statistics: true,
             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: 'allPrice', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true },
-          { title: '出库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.hidden },
-          { title: '出库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.hidden },
           {
             title: '出库人',
             key: 'warehousingUser',
@@ -409,15 +368,7 @@ export default {
     //调用完edit()方法之后会自动调用此方法
     editAfter() {
       this.billStatus = '0'
-      
       this.rowCanEdit = true
-      this.materialTable.columns[0].type = FormTypes.popupJsh
-      this.changeColumnHide()
-      this.changeFormTypes(this.materialTable.columns, 'snList', 0)
-      // this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
-      this.changeFormTypes(this.materialTable.columns, 'expirationDate', 0)
-      this.changeFormTypes(this.materialTable.columns, 'preNumber', 0)
-      this.changeFormTypes(this.materialTable.columns, 'finishNumber', 0)
       if (this.action === 'add') {
         this.addInit(this.prefixNo)
         this.fileList = []
@@ -508,8 +459,6 @@ export default {
     waitBillListOk(selectBillDetailRows, linkNumber, remark) {
       this.rowCanEdit = false
       this.materialTable.columns[1].type = FormTypes.normal
-      this.changeFormTypes(this.materialTable.columns, 'preNumber', 1)
-      this.changeFormTypes(this.materialTable.columns, 'finishNumber', 1)
       if (selectBillDetailRows && selectBillDetailRows.length > 0) {
         let listEx = []
         for (let j = 0; j < selectBillDetailRows.length; j++) {
@@ -521,7 +470,6 @@ export default {
           info.allPrice = 0
           info.linkId = info.id
           listEx.push(info)
-          this.changeColumnShow(info)
         }
         this.materialTable.dataSource = listEx
         this.$nextTick(() => {
@@ -532,9 +480,6 @@ export default {
         })
       }
     },
-    getUnitInfo(val) {
-      this.unitList = val
-    },
   },
 }
 </script>

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

@@ -24,8 +24,8 @@
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -61,12 +61,12 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
               <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -78,7 +78,7 @@
               <a-input placeholder="请输入单据编号" v-decorator.trim="['number']" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -96,7 +96,7 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -112,7 +112,7 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -131,7 +131,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
-          :minWidth="1200"
+          minWidth="100%"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="rowCanEdit"
@@ -140,32 +140,8 @@
           @valueChange="onValueChange"
           @added="onAdded"
           @deleted="onDeleted"
-          @focusChange="getUnitInfo"
         >
           <template #buttonAfter>
-            <a-row
-              v-if="false"
-              :gutter="24"
-              style="float: left; padding-bottom: 5px"
-              data-step="4"
-              data-title="扫码录入"
-              data-intro="此功能支持扫码枪扫描SKU进行录入"
-            >
-              <a-col v-if="scanStatus" :md="6" :sm="24">
-                <a-button @click="scanEnter">扫码录入</a-button>
-              </a-col>
-              <a-col v-if="!scanStatus" :md="16" :sm="24" style="padding: 0 8px 0 12px">
-                <a-input
-                  placeholder="请扫描SKU并回车"
-                  v-model="scanBarCode"
-                  @pressEnter="scanPressEnter"
-                  ref="scanBarCode"
-                />
-              </a-col>
-              <a-col v-if="!scanStatus" :md="6" :sm="24" style="padding: 0px 12px 0 0">
-                <a-button @click="stopScan">收起扫码</a-button>
-              </a-col>
-            </a-row>
             <a-row :gutter="24" style="float: left; padding-bottom: 5px">
               <a-col :md="24" :sm="24">
                 <a-button style="margin-left: 8px" @click="handleHistoryBillList"
@@ -177,32 +153,6 @@
               <a-button icon="import" @click="onImport(prefixNo)">导入明细</a-button>
             </a-row>
           </template>
-          <!-- <template #depotBatchSet>
-            <a-icon type="down" @click="handleBatchSetDepot" />
-          </template> -->
-          <!-- <template #depotAdd>
-            <a-divider v-if="quickBtn.depot" style="margin: 4px 0" />
-            <div v-if="quickBtn.depot" style="padding: 4px 8px; cursor: pointer" @click="addDepot">
-              <a-icon type="plus" /> 新增仓库
-            </div>
-          </template> -->
-          <template #unit="{ handleChange, handleFocus, value }">
-            <a-select
-              placeholder="请选择"
-              v-decorator="['unit']"
-              :dropdownMatchSelectWidth="false"
-              showSearch
-              :allowClear="false"
-              optionFilterProp="children"
-              :value="value"
-              @change="($event) => handleChange($event)"
-              @focus="($event) => handleFocus($event)"
-            >
-              <a-select-option v-for="(item, index) in unitList" :key="index" :value="item.name">
-                {{ item.name }}
-              </a-select-option>
-            </a-select>
-          </template>
           <template #warehousingUser="{ handleChange, value }">
             <a-select
               placeholder="请选择"
@@ -220,6 +170,7 @@
           <template #depotId="{ value }">
             <a-select
               disabled
+              :showArrow="false"
               :value="value"
               :options="depotList"
             >
@@ -239,16 +190,19 @@
               </a-tooltip>
             </a-input>
           </template>
+          <template #sku="{value, index, target,rowId }">
+            <JSelectMaterial :value="value" :disabled="!rowCanEdit" @change="($event) => handleSelectMaterial({...$event,target,rowId,index,value})"></JSelectMaterial>
+          </template>
         </j-editable-table>
-        <a-row class="form-row" :gutter="24">
+        <a-row class="form-row" :gutter="24" type="flex">
           <a-col :lg="24" :md="24" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="{ xs: { span: 24 }, sm: { span: 24 } }" label="">
               <a-textarea :rows="1" placeholder="请输入备注" v-decorator="['remark']" style="margin-top: 8px" />
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -258,7 +212,7 @@
               data-intro="针对单据明细中商品总金额进行优惠的比例"
             >
               <a-input
-                style="width: 80%"
+                style="width: 100%"
                 placeholder="请输入优惠率"
                 v-decorator.trim="['discount']"
                 suffix="%"
@@ -266,7 +220,7 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -282,7 +236,7 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -294,7 +248,7 @@
               <a-input placeholder="请输入优惠后金额" v-decorator.trim="['discountLastMoney']" :disabled="true" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -307,8 +261,8 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -318,7 +272,7 @@
               data-intro="如果在下拉框中选择多账户，则可以通过多个结算账户进行结算"
             >
               <a-select
-                style="width: 80%"
+                style="width: 100%"
                 placeholder="请选择结算账户"
                 v-decorator="['accountId', validatorRules.accountId]"
                 :dropdownMatchSelectWidth="false"
@@ -353,13 +307,19 @@
               </a-tooltip>
             </a-form-item>
           </a-col>
-          <a-col v-if="depositStatus" :lg="6" :md="12" :sm="24">
+          <a-col v-if="depositStatus" :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="扣除订金">
               <a-input v-decorator.trim="['deposit']" @change="onChangeDeposit" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
-            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次实际付款">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
+            <a-form-item :labelCol="{
+              xs: { span: 24 },
+              sm: { span: 9 },
+            }" :wrapperCol="{
+              xs: { span: 24 },
+              sm: { span: 15 },
+            }" label="本次实际付款">
               <a-input
                 disabled
                 placeholder="请输入本次付款"
@@ -368,7 +328,7 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -385,8 +345,8 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -399,8 +359,8 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -448,6 +408,7 @@ import JUpload from '@/components/jeecg/JUpload'
 import JDate from '@/components/jeecg/JDate'
 import Vue from 'vue'
 import JImageUpload from '@/components/jeecg/JImageUpload.vue'
+import JSelectMaterial from '@/components/jeecgbiz/JSelectMaterial'
 
 export default {
   name: 'PurchaseInModal',
@@ -465,6 +426,7 @@ export default {
     BillPrintIframe,
     JUpload,
     JDate,
+    JSelectMaterial,
     VNodes: {
       functional: true,
       render: (h, ctx) => ctx.props.vnodes,
@@ -503,16 +465,12 @@ export default {
           {
             title: 'SKU',
             key: 'sku',
-            width: '200px',
-            type: FormTypes.popupJsh,
-            kind: 'material',
-            multi: true,
-            newBatch: true,
+            width: '280px',
+            type: FormTypes.slot,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '名称', key: 'name', width: '120px', type: FormTypes.normal },
           { title: '规格', key: 'standard', width: '120px', type: FormTypes.normal },
-
           {
             title: '生产日期',
             key: 'productionDate',
@@ -524,13 +482,7 @@ export default {
           { title: '仓库名', key: 'depotId', width: '120px', type: FormTypes.slot},
           { title: '仓库货架', key: 'position', width: '120px', type: FormTypes.input },
           { title: '包装规格', key: 'unitName', width: '120px', type: FormTypes.normal },
-
-          { title: '型号', key: 'model', width: '120px', type: FormTypes.normal },
-          { title: '颜色', key: 'color', width: '120px', type: FormTypes.normal },
-          { title: '品牌', key: 'brand', width: '120px', type: FormTypes.normal },
-          { title: '制造商', key: 'mfrs', width: '120px', type: FormTypes.normal },
-          { title: '扩展信息', key: 'materialOther', width: '120px', type: FormTypes.normal },
-          { title: '库存', key: 'inventory', width: '120px', type: FormTypes.normal },
+          { title: '库存', key: 'stock', width: '120px', type: FormTypes.normal },
           {
             title: '单位',
             key: 'unit',
@@ -538,30 +490,21 @@ export default {
             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: '单位id', key: 'unitId', width: '120px', type: FormTypes.hidden },
-          { title: '单位列表', key: 'unitList', width: '120px', type: FormTypes.hidden },
-          { title: '序列号', key: 'snList', width: '120px', type: FormTypes.popupJsh, kind: 'snAdd', multi: true },
-          { title: '有效期', key: 'expirationDate', width: '120px', type: FormTypes.date },
-          { title: '多属性', key: 'sku', width: '120px', type: FormTypes.normal },
-          { title: '原数量', key: 'preNumber', width: '120px', type: FormTypes.normal },
-          { title: '已入库', key: 'finishNumber', width: '120px', type: FormTypes.normal },
-          {
             title: '入库数量',
             key: 'operNumber',
             width: '120px',
             type: FormTypes.inputNumber,
-            statistics: true,
             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: '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: 'allPrice', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true },
-          { title: '税率', key: 'taxRate', width: '120px', type: FormTypes.hidden, placeholder: '%' },
           {
             title: '税额',
             key: 'taxMoney',
@@ -572,8 +515,6 @@ export default {
           },
           { title: '价税合计', key: 'taxLastMoney', width: '120px', type: FormTypes.inputNumber,disabled: true, statistics: true },
 
-          { title: '入库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.hidden },
-          { title: '入库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.hidden },
           {
             title: '入库人',
             key: 'warehousingUser',
@@ -583,13 +524,16 @@ export default {
             validateRules: [{ required: true, message: '入库人不能为空' }],
           },
           { title: '入库时间', key: 'warehousingTime', width: '200px', type: FormTypes.date },
-
           { title: '备注', key: 'remark', width: '200px', type: FormTypes.input },
+          // 以下隐藏字段有用
           { title: '关联id', key: 'linkId', width: '120px', type: FormTypes.hidden },
+          { title: '税率', key: 'taxRate', width: '120px', type: FormTypes.hidden, placeholder: '%' },
           { title: '默认销售价', key: 'defaultWholesaleDecimal', width: '120px', type: FormTypes.hidden },
           { title: '默认采购价', key: 'defaultPurchaseDecimal', width: '120px', type: FormTypes.hidden },
           { title: '单位换算比例', key: 'ratio', width: '120px', type: FormTypes.hidden },
         ],
+        validRules:{
+        },
       },
       confirmLoading: false,
       validatorRules: {
@@ -628,13 +572,6 @@ export default {
       console.log('this.model======',this.model)
       this.billStatus = '0'
       this.rowCanEdit = true
-      this.materialTable.columns[0].type = FormTypes.popupJsh
-      this.changeColumnHide()
-      this.changeFormTypes(this.materialTable.columns, 'snList', 0)
-      // this.changeFormTypes(this.materialTable.columns, 'batchNumber', 0)
-      this.changeFormTypes(this.materialTable.columns, 'expirationDate', 0)
-      this.changeFormTypes(this.materialTable.columns, 'preNumber', 0)
-      this.changeFormTypes(this.materialTable.columns, 'finishNumber', 0)
       if (this.action === 'add') {
         this.depositStatus = false
         this.addInit(this.prefixNo)
@@ -700,7 +637,7 @@ export default {
           mpList: getMpListShort(Vue.ls.get('materialPropertyList')), //扩展属性
           linkType: 'basic',
         }
-        let url = this.readOnly ? this.url.detailList : this.url.detailList
+        let url = this.url.detailList
         this.requestSubTableData(url, params, this.materialTable)
       }
       //复制新增单据-初始化单号和日期
@@ -766,8 +703,6 @@ export default {
     linkBillListOk(selectBillDetailRows, linkNumber, organId, discountMoney, deposit, remark, depotId, accountId) {
       let that = this
       this.rowCanEdit = false
-      // this.changeFormTypes(this.materialTable.columns, 'preNumber', 1)
-      // this.changeFormTypes(this.materialTable.columns, 'finishNumber', 1)
       console.log('selectBillDetailRows', selectBillDetailRows)
       if (selectBillDetailRows && selectBillDetailRows.length > 0) {
         let listEx = []
@@ -784,7 +719,6 @@ export default {
           info.linkId = info.id
           allTaxLastMoney += info.taxLastMoney
           listEx.push(info)
-          this.changeColumnShow(info)
         }
         this.materialTable.dataSource = listEx
 
@@ -801,19 +735,19 @@ export default {
           changeAmount = (discountLastMoney - deposit).toFixed(2) - 0
         }
         console.log('depotId===',depotId)
-        this.form.setFieldsValue({
-          organId: organId,
-          linkNumber: linkNumber,
-          discount: discount,
-          discountMoney: discountMoney,
-          discountLastMoney: discountLastMoney,
-          deposit: deposit,
-          changeAmount: changeAmount,
-          accountId: accountId,
-          remark: remark,
-          depotId: depotId,
-        })
         this.$nextTick(() => {
+          this.form.setFieldsValue({
+            organId: organId,
+            linkNumber: linkNumber,
+            discount: discount,
+            discountMoney: discountMoney,
+            discountLastMoney: discountLastMoney,
+            deposit: deposit,
+            changeAmount: changeAmount,
+            accountId: accountId,
+            remark: remark,
+            depotId: depotId,
+          })
           console.log('discount===',this.form.getFieldValue('discount'))
           this.getTatRate(organId)
         })
@@ -825,9 +759,6 @@ export default {
         }
       }
     },
-    getUnitInfo(val) {
-      this.unitList = val
-    },
   },
 }
 </script>

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

@@ -24,8 +24,8 @@
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -60,12 +60,12 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
               <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -77,7 +77,7 @@
               <a-input placeholder="请输入单据编号" v-decorator.trim="['number']" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -95,7 +95,7 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -111,7 +111,7 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -123,13 +123,13 @@
               <a-input placeholder="自动带出" disabled v-decorator="['taxRate']" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               v-if="purchaseBySaleFlag"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
               label="关联订单"
-              data-step="5"
+              data-step="6"
               data-title="关联订单"
               data-intro="采购订单单据可以通过关联订单来选择已录入的销售订单，选择之后会自动加载订单的内容，
               提交之后原来的销售订单会对应的改变单据状态。另外本系统支持分批多次关联"
@@ -148,7 +148,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
-          :minWidth="1200"
+          minWidth="100%"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="rowCanEdit"
@@ -157,7 +157,6 @@
           @valueChange="onValueChange"
           @added="onAdded"
           @deleted="onDeleted"
-          @focusChange="getUnitInfo"
         >
           <template #buttonAfter>
             <a-row
@@ -197,6 +196,7 @@
           <template #depotId="{ value }">
             <a-select
               disabled
+              :showArrow="false"
               :value="value"
               :options="depotList"
             >
@@ -216,43 +216,27 @@
               </a-tooltip>
             </a-input>
           </template>
-          <!-- <template #unit="{ handleChange, handleFocus, value }">
-            <a-select
-              placeholder="请选择"
-              v-decorator="['unit']"
-              :dropdownMatchSelectWidth="false"
-              showSearch
-              :allowClear="false"
-              optionFilterProp="children"
-              :value="value"
-              @change="($event) => handleChange($event)"
-              @focus="($event) => handleFocus($event)"
-            >
-              <a-select-option v-for="(item, index) in unitList" :key="index" :value="item.name">
-                {{ item.name }}
-              </a-select-option>
-            </a-select>
-          </template> -->
+          <template #sku="{ value, index, target,rowId }">
+            <JSelectMaterial :value="value" :disabled="!rowCanEdit" @change="($event) => handleSelectMaterial({...$event,target,rowId,index,value})"></JSelectMaterial>
+          </template>
         </j-editable-table>
-        <a-row class="form-row" :gutter="24">
+        <a-row class="form-row" :gutter="24" type="flex">
           <a-col :lg="24" :md="24" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="{ xs: { span: 24 }, sm: { span: 24 } }" label="">
               <a-textarea :rows="1" placeholder="请输入备注" v-decorator="['remark']" style="margin-top: 8px" />
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
               label="优惠率"
-              data-step="5"
+              data-step="7"
               data-title="优惠率"
               data-intro="针对单据明细中商品总金额进行优惠的比例"
             >
               <a-input
-                style="width: 80%"
+                style="width: 100%"
                 placeholder="请输入优惠率"
                 v-decorator.trim="['discount']"
                 suffix="%"
@@ -260,12 +244,12 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
               label="付款优惠"
-              data-step="6"
+              data-step="8"
               data-title="付款优惠"
               data-intro="针对单据明细中商品总金额进行优惠的金额"
             >
@@ -276,34 +260,31 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
               label="优惠后金额"
-              data-step="7"
+              data-step="9"
               data-title="优惠后金额"
               data-intro="针对单据明细中商品总金额进行优惠后的金额"
             >
               <a-input placeholder="请输入优惠后金额" v-decorator.trim="['discountLastMoney']" disabled />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24"></a-col>
-        </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
               label="结算账户"
-              data-step="8"
+              data-step="10"
               data-title="结算账户"
               data-intro="如果在下拉框中选择多账户，则可以通过多个结算账户进行结算"
             >
               <a-select
-                style="width: 80%"
+                style="width: 100%"
                 placeholder="请选择结算账户"
-                v-decorator="['accountId']"
+                v-decorator="['accountId', validatorRules.accountId]"
                 :dropdownMatchSelectWidth="false"
                 allowClear
                 @select="selectAccount"
@@ -336,12 +317,12 @@
               </a-tooltip>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
               label="支付订金"
-              data-step="9"
+              data-step="11"
               data-title="支付订金"
               data-intro="填写订金之后，在采购入库单会自动计算扣除订金"
             >
@@ -352,16 +333,14 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24"> </a-col>
-          <a-col :lg="6" :md="12" :sm="24"> </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
               label="附件"
-              data-step="10"
+              data-step="12"
               data-title="附件"
               data-intro="可以上传与单据相关的图片、文档，支持多个文件"
             >
@@ -369,13 +348,13 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
               label="凭证图片"
-              data-step="11"
+              data-step="13"
               data-title="附件"
               data-intro="可以上传与单据相关的图片、文档，支持多个文件"
             >
@@ -414,6 +393,8 @@ import JUpload from '@/components/jeecg/JUpload'
 import JImageUpload from '@/components/jeecg/JImageUpload.vue'
 import JDate from '@/components/jeecg/JDate'
 import Vue from 'vue'
+import JSelectMaterial from '@/components/jeecgbiz/JSelectMaterial'
+
 // import QrcodeVue from 'qrcode.vue'
 export default {
   name: 'PurchaseOrderModal',
@@ -430,6 +411,7 @@ export default {
     JUpload,
     JImageUpload,
     JDate,
+    JSelectMaterial,
     // QrcodeVue,
     VNodes: {
       functional: true,
@@ -472,10 +454,8 @@ export default {
           {
             title: 'SKU',
             key: 'sku',
-            width: '200px',
-            type: FormTypes.popupJsh,
-            kind: 'material',
-            multi: true,
+            width: '280px',
+            type: FormTypes.slot,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '名称', key: 'name', width: '120px', type: FormTypes.normal },
@@ -493,12 +473,7 @@ export default {
           { title: '仓库货架', key: 'position', width: '120px', type: FormTypes.input },
           { title: '包装规格', key: 'unitName', width: '120px', type: FormTypes.normal },
 
-          { title: '型号', key: 'model', width: '120px', type: FormTypes.normal },
-          { title: '颜色', key: 'color', width: '120px', type: FormTypes.normal },
-          { title: '品牌', key: 'brand', width: '120px', type: FormTypes.normal },
-          { title: '制造商', key: 'mfrs', width: '120px', type: FormTypes.normal },
-          { title: '扩展信息', key: 'materialOther', width: '120px', type: FormTypes.normal },
-          { title: '库存', key: 'inventory', width: '120px', type: FormTypes.normal },
+          { title: '库存', key: 'stock', width: '120px', type: FormTypes.normal },
           {
             title: '单位',
             key: 'unit',
@@ -506,25 +481,21 @@ export default {
             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: '单位id', key: 'unitId', width: '120px', type: FormTypes.hidden },
-          { title: '单位列表', key: 'unitList', width: '120px', type: FormTypes.hidden },
-          {
             title: '入库数量',
             key: 'operNumber',
             width: '120px',
             type: FormTypes.inputNumber,
-            statistics: true,
             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: '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: 'allPrice', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true, },
-          { title: '税率', key: 'taxRate', width: '120px', type: FormTypes.hidden, placeholder: '%' },
           {
             title: '税额',
             key: 'taxMoney',
@@ -536,6 +507,7 @@ export default {
           { title: '价税合计', key: 'taxLastMoney', width: '120px', type: FormTypes.inputNumber,disabled: true, statistics: true, },
           { title: '备注', key: 'remark', width: '200px', type: FormTypes.input },
           { title: '关联id', key: 'linkId', width: '120px', type: FormTypes.hidden },
+          { title: '税率', key: 'taxRate', width: '120px', type: FormTypes.hidden, placeholder: '%' },
           { title: '默认销售价', key: 'defaultWholesaleDecimal', width: '120px', type: FormTypes.hidden },
           { title: '默认采购价', key: 'defaultPurchaseDecimal', width: '120px', type: FormTypes.hidden },
           { title: '单位换算比例', key: 'ratio', width: '120px', type: FormTypes.hidden },
@@ -552,6 +524,9 @@ export default {
         depotId: {
           rules: [{ required: true, message: '请选择仓库名!' }],
         },
+        accountId: {
+          rules: [{ required: true, message: '请选择结算账户！' }],
+        },
       },
       url: {
         add: '/depotHead/addDepotHeadAndDetail',
@@ -569,7 +544,6 @@ export default {
       console.log('this.model======',this.model)
       this.billStatus = '0'
       this.rowCanEdit = true
-      this.changeColumnHide()
       if (this.action === 'add') {
         this.addInit(this.prefixNo)
         this.fileList = []
@@ -690,7 +664,6 @@ export default {
     },
     linkBillListOk(selectBillDetailRows, linkNumber, organId) {
       this.rowCanEdit = false
-      this.materialTable.columns[1].type = FormTypes.normal
       if (selectBillDetailRows && selectBillDetailRows.length > 0) {
         let discountLastMoney = 0
         for (let j = 0; j < selectBillDetailRows.length; j++) {
@@ -705,7 +678,6 @@ export default {
             discountLastMoney += info.allPrice
           }
           info.linkId = info.id
-          this.changeColumnShow(info)
         }
         //根据单号查询单据类型
         findBillDetailByNumber({ number: linkNumber }).then((res) => {
@@ -737,9 +709,6 @@ export default {
         this.materialTable.dataSource = selectBillDetailRows
       }
     },
-    getUnitInfo(val) {
-      this.unitList = val
-    },
   },
 }
 </script>

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

@@ -24,8 +24,8 @@
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -61,12 +61,12 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
               <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -78,7 +78,7 @@
               <a-input placeholder="请输入单据编号" v-decorator.trim="['number']" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -94,7 +94,7 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -110,7 +110,7 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -129,7 +129,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
-          :minWidth="minWidth"
+          minWidth="100%"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="true"
@@ -138,7 +138,6 @@
           @valueChange="onValueChange"
           @added="onAdded"
           @deleted="onDeleted"
-          @focusChange="getUnitInfo"
         >
           <template #buttonAfter>
             <a-row
@@ -177,6 +176,7 @@
           <template #depotId="{ value }">
             <a-select
               disabled
+              :showArrow="false"
               :value="value"
               :options="depotList"
             >
@@ -189,16 +189,17 @@
               </a-tooltip>
             </a-input>
           </template>
+          <template #sku="{ value, index, target,rowId }">
+            <JSelectMaterial :value="value" @change="($event) => handleSelectMaterial({...$event,target,rowId,index,value})"></JSelectMaterial>
+          </template>
         </j-editable-table>
-        <a-row class="form-row" :gutter="24">
+        <a-row class="form-row" :gutter="24" type="flex">
           <a-col :lg="24" :md="24" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="{ xs: { span: 24 }, sm: { span: 24 } }" label="">
               <a-textarea :rows="1" placeholder="请输入备注" v-decorator="['remark']" style="margin-top: 8px" />
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -208,7 +209,7 @@
               data-intro="针对单据明细中商品总金额进行优惠的比例"
             >
               <a-input
-                style="width: 80%"
+                style="width: 100%"
                 placeholder="请输入优惠率"
                 v-decorator.trim="['discount']"
                 suffix="%"
@@ -216,7 +217,7 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -232,7 +233,7 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -244,10 +245,7 @@
               <a-input placeholder="请输入优惠后金额" v-decorator.trim="['discountLastMoney']" :disabled="true" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24"></a-col>
-        </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -257,9 +255,9 @@
               data-intro="如果在下拉框中选择多账户，则可以通过多个结算账户进行结算"
             >
               <a-select
-                style="width: 80%"
+                style="width: 100%"
                 placeholder="请选择结算账户"
-                v-decorator="['accountId']"
+                v-decorator="['accountId', validatorRules.accountId]"
                 :dropdownMatchSelectWidth="false"
                 allowClear
                 @select="selectAccount"
@@ -292,7 +290,7 @@
               </a-tooltip>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -308,24 +306,24 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收货人" data-step="10">
               <a-input placeholder="请输入收货人" v-decorator.trim="['receiverName']" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收货人电话" data-step="10">
               <a-input placeholder="请输入收货人电话" v-decorator.trim="['receiverPhone']" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收货地址" data-step="8">
-              <a-input style="width: 80%" placeholder="请输入收货地址" v-decorator.trim="['receiverAddress']" />
+              <a-input style="width: 100%" placeholder="请输入收货地址" v-decorator.trim="['receiverAddress']" />
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -366,6 +364,8 @@ import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
 import JUpload from '@/components/jeecg/JUpload'
 import JDate from '@/components/jeecg/JDate'
 import Vue from 'vue'
+import JSelectMaterial from '@/components/jeecgbiz/JSelectMaterial'
+
 export default {
   name: 'SaleOrderModal',
   mixins: [JEditableTableMixin, BillModalMixin],
@@ -380,6 +380,7 @@ export default {
     JUpload,
     JDate,
     JSelectMultiple,
+    JSelectMaterial,
     VNodes: {
       functional: true,
       render: (h, ctx) => ctx.props.vnodes,
@@ -414,37 +415,28 @@ export default {
           {
             title: 'SKU',
             key: 'sku',
-            width: '200px',
-            type: FormTypes.popupJsh,
-            kind: 'material',
-            multi: true,
+            width: '280px',
+            type: FormTypes.slot,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '名称', key: 'name', width: '120px', type: FormTypes.normal },
+          { title: '规格', key: 'standard', width: '120px', type: FormTypes.normal },
           { title: '仓库名', key: 'depotId', width: '120px', type: FormTypes.slot },
           { title: '仓库货架', key: 'position', width: '120px', type: FormTypes.input },
           { title: '包装规格', key: 'unitName', width: '120px', type: FormTypes.normal },
 
-          { title: '型号', key: 'model', width: '120px', type: FormTypes.normal },
-          { title: '颜色', key: 'color', width: '120px', type: FormTypes.normal },
-          { title: '品牌', key: 'brand', width: '120px', type: FormTypes.normal },
-          { title: '扩展信息', key: 'materialOther', width: '120px', type: FormTypes.normal },
           { title: '库存', key: 'stock', width: '120px', type: FormTypes.normal },
           {
             title: '单位',
             key: 'unit',
             width: '120px',
             type: FormTypes.normal,
-            // options: [],
-            // allowClear: false,
-            // slotName: 'unit',
           },
           {
             title: '出库数量',
             key: 'operNumber',
             width: '120px',
             type: FormTypes.inputNumber,
-            // statistics: true,
             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: '金额格式不正确!' }], },
@@ -478,6 +470,9 @@ export default {
         depotId: {
           rules: [{ required: true, message: '请选择仓库名!' }],
         },
+        accountId: {
+          rules: [{ required: true, message: '请选择结算账户！' }],
+        },
       },
       url: {
         add: '/depotHead/addDepotHeadAndDetail',
@@ -593,9 +588,6 @@ export default {
       this.$refs.historyBillListModalForm.show('其它', '销售订单', '客户', organId)
       this.$refs.historyBillListModalForm.disableSubmit = false
     },
-    getUnitInfo(val) {
-      this.unitList = val
-    },
   },
 }
 </script>

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

@@ -24,8 +24,8 @@
     </template>
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -62,12 +62,12 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
               <j-date v-decorator="['operTime', validatorRules.operTime]" :show-time="true" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -79,7 +79,7 @@
               <a-input placeholder="请输入单据编号" v-decorator.trim="['number']" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -97,7 +97,7 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -113,7 +113,7 @@
               </a-select>
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -132,7 +132,7 @@
           :loading="materialTable.loading"
           :columns="materialTable.columns"
           :dataSource="materialTable.dataSource"
-          :minWidth="minWidth"
+          minWidth="100%"
           :maxHeight="300"
           :rowNumber="false"
           :rowSelection="rowCanEdit"
@@ -141,7 +141,6 @@
           @valueChange="onValueChange"
           @added="onAdded"
           @deleted="onDeleted"
-          @focusChange="getUnitInfo"
         >
           <template #buttonAfter>
             <a-row
@@ -178,23 +177,6 @@
               <a-button icon="import" @click="onImport(prefixNo)">导入明细</a-button>
             </a-row>
           </template>
-          <template #unit="{ handleChange, handleFocus, value }">
-            <a-select
-              placeholder="请选择"
-              v-decorator="['unit']"
-              :dropdownMatchSelectWidth="false"
-              showSearch
-              :allowClear="false"
-              optionFilterProp="children"
-              :value="value"
-              @change="($event) => handleChange($event)"
-              @focus="($event) => handleFocus($event)"
-            >
-              <a-select-option v-for="(item, index) in unitList" :key="index" :value="item.name">
-                {{ item.name }}
-              </a-select-option>
-            </a-select>
-          </template>
           <template #warehousingUser="{ handleChange, value }">
             <a-select
               placeholder="请选择"
@@ -212,18 +194,12 @@
           <template #depotId="{ value }">
             <a-select
               disabled
+              :showArrow="false"
               :value="value"
               :options="depotList"
             >
             </a-select>
           </template>
-          <!-- <template #wholesaleDecimal="{ handleChange, value, index }">
-            <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" />
-              </a-tooltip>
-            </a-input>
-          </template> -->
           <template #unitPrice="{ handleChange, value, index,allValues }">
             <a-input :value="value" @change="($event) => onChangePrice($event,handleChange)">
               <a-tooltip slot="suffix" title="修改后和默认价格不一致">
@@ -231,16 +207,19 @@
               </a-tooltip>
             </a-input>
           </template>
+          <template #sku="{value, index, target,rowId }">
+            <JSelectMaterial :value="value" :disabled="!rowCanEdit" @change="($event) => handleSelectMaterial({...$event,target,rowId,index,value})"></JSelectMaterial>
+          </template>
         </j-editable-table>
-        <a-row class="form-row" :gutter="24">
+        <a-row class="form-row" :gutter="24" type="flex">
           <a-col :lg="24" :md="24" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="{ xs: { span: 24 }, sm: { span: 24 } }" label="">
               <a-textarea :rows="1" placeholder="请输入备注" v-decorator="['remark']" style="margin-top: 8px" />
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -250,7 +229,7 @@
               data-intro="针对单据明细中商品总金额进行优惠的比例"
             >
               <a-input
-                style="width: 80%"
+                style="width: 100%"
                 placeholder="请输入优惠率"
                 v-decorator.trim="['discount']"
                 suffix="%"
@@ -258,7 +237,7 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -274,7 +253,7 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -286,7 +265,7 @@
               <a-input placeholder="请输入优惠后金额" v-decorator.trim="['discountLastMoney']" disabled />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -298,9 +277,7 @@
               <a-input placeholder="请输入其它费用" v-decorator.trim="['otherMoney']" @change="onChangeOtherMoney" />
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -310,7 +287,7 @@
               data-intro="如果在下拉框中选择多账户，则可以通过多个结算账户进行结算"
             >
               <a-select
-                style="width: 80%"
+                style="width: 100%"
                 placeholder="请选择结算账户"
                 v-decorator="['accountId', validatorRules.accountId]"
                 :dropdownMatchSelectWidth="false"
@@ -345,12 +322,12 @@
               </a-tooltip>
             </a-form-item>
           </a-col>
-          <a-col v-if="depositStatus" :lg="6" :md="12" :sm="24">
+          <a-col v-if="depositStatus" :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="扣除订金">
               <a-input v-decorator.trim="['deposit']" @change="onChangeDeposit" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次收款">
               <a-input
                 placeholder="请输入本次收款"
@@ -359,7 +336,7 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -375,9 +352,7 @@
               />
             </a-form-item>
           </a-col>
-        </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -394,24 +369,24 @@
               />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收货人" data-step="10">
               <a-input placeholder="请输入收货人" v-decorator="['receiverName']" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收货人电话" data-step="10">
               <a-input placeholder="请输入收货人电话" v-decorator="['receiverPhone']" />
             </a-form-item>
           </a-col>
-          <a-col :lg="6" :md="12" :sm="24">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收货地址" data-step="10">
               <a-input placeholder="请输入收货地址" v-decorator="['receiverAddress']" />
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -424,8 +399,8 @@
             </a-form-item>
           </a-col>
         </a-row>
-        <a-row class="form-row" :gutter="24">
-          <a-col :lg="6" :md="12" :sm="24">
+        <a-row class="form-row" :gutter="24" type="flex">
+          <a-col :xl="6" :lg="8" :md="12" :sm="24">
             <a-form-item
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
@@ -471,6 +446,7 @@ import { getMpListShort, handleIntroJs } from '@/utils/util'
 import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
 import JUpload from '@/components/jeecg/JUpload'
 import JImageUpload from '@/components/jeecg/JImageUpload.vue'
+import JSelectMaterial from '@/components/jeecgbiz/JSelectMaterial'
 
 import JDate from '@/components/jeecg/JDate'
 import Vue from 'vue'
@@ -492,6 +468,7 @@ export default {
     JDate,
     JSelectMultiple,
     JImageUpload,
+    JSelectMaterial,
     VNodes: {
       functional: true,
       render: (h, ctx) => ctx.props.vnodes,
@@ -529,47 +506,32 @@ export default {
           {
             title: 'SKU',
             key: 'sku',
-            width: '200px',
-            type: FormTypes.popupJsh,
-            kind: 'material',
-            multi: true,
-            newBatch: true,
+            width: '280px',
+            type: FormTypes.slot,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
           { title: '名称', key: 'name', width: '120px', type: FormTypes.normal },
-          // { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
+          { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
           { title: '仓库名', key: 'depotId', width: '120px', type: FormTypes.slot },
           { title: '仓库货架', key: 'position', width: '120px', type: FormTypes.input },
           { title: '包装规格', key: 'unitName', width: '120px', type: FormTypes.normal },
 
-          { title: '型号', key: 'model', width: '120px', type: FormTypes.normal },
-          { title: '颜色', key: 'color', width: '120px', type: FormTypes.normal },
-          { title: '品牌', key: 'brand', width: '120px', type: FormTypes.normal },
-          { title: '制造商', key: 'mfrs', width: '120px', type: FormTypes.normal },
-          { title: '扩展信息', key: 'materialOther', width: '120px', type: FormTypes.normal },
           { title: '库存', key: 'stock', width: '120px', type: FormTypes.normal },
           {
             title: '单位',
             key: 'unit',
             width: '120px',
             type: FormTypes.normal,
-            // options: [],
-            // allowClear: false,
-            // slotName: 'unit',
           },
-          { title: '单位id', key: 'unitId', width: '120px', type: FormTypes.hidden },
-          { title: '单位列表', key: 'unitList', width: '120px', type: FormTypes.hidden },
           {
             title: '出库数量',
             key: 'operNumber',
             width: '120px',
             type: FormTypes.inputNumber,
-            // statistics: true,
             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: 'allPrice', width: '120px', type: FormTypes.inputNumber,disabled: true, statistics: true },
-          { title: '税率', key: 'taxRate', width: '120px', type: FormTypes.hidden, placeholder: '%' },
           {
             title: '税额',
             key: 'taxMoney',
@@ -579,8 +541,6 @@ export default {
             statistics: true,
           },
           { title: '价税合计', key: 'taxLastMoney', width: '120px', type: FormTypes.inputNumber, disabled: true, statistics: true },
-          { title: '出库差异', key: 'warehousingVariance', width: '120px', type: FormTypes.hidden },
-          { title: '出库差异原因', key: 'reasonOfDifference', width: '120px', type: FormTypes.hidden },
           {
             title: '出库人',
             key: 'warehousingUser',
@@ -590,9 +550,9 @@ export default {
             validateRules: [{ required: true, message: '出库人不能为空' }],
           },
           { title: '出库时间', key: 'warehousingTime', width: '200px', type: FormTypes.date },
-
           { title: '备注', key: 'remark', width: '200px', type: FormTypes.input },
           { title: '关联id', key: 'linkId', width: '120px', type: FormTypes.hidden },
+          { title: '税率', key: 'taxRate', width: '120px', type: FormTypes.hidden, placeholder: '%' },
           { title: '默认销售价', key: 'defaultWholesaleDecimal', width: '120px', type: FormTypes.hidden },
           { title: '默认采购价', key: 'defaultPurchaseDecimal', width: '120px', type: FormTypes.hidden },
           { title: '单位换算比例', key: 'ratio', width: '120px', type: FormTypes.hidden },
@@ -633,8 +593,6 @@ export default {
     editAfter() {
       this.billStatus = '0'
       this.rowCanEdit = true
-      this.materialTable.columns[0].type = FormTypes.popupJsh
-      this.changeColumnHide()
       if (this.action === 'add') {
         this.depositStatus = false
         this.addInit(this.prefixNo)
@@ -785,7 +743,6 @@ export default {
     ) {
       let that = this
       this.rowCanEdit = false
-      // this.materialTable.columns[1].type = FormTypes.normal
       if (selectBillDetailRows && selectBillDetailRows.length > 0) {
         let listEx = []
         let allTaxLastMoney = 0
@@ -801,7 +758,6 @@ export default {
           info.linkId = info.id
           allTaxLastMoney += info.taxLastMoney
           listEx.push(info)
-          this.changeColumnShow(info)
         }
         this.materialTable.dataSource = listEx
         ///给优惠后金额重新赋值
@@ -846,9 +802,6 @@ export default {
         }
       }
     },
-    getUnitInfo(val) {
-      this.unitList = val
-    },
   },
 }
 </script>

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

@@ -23,7 +23,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="关键词" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入条码、名称、助记码等查询" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="请输入sku、名称、助记码等查询" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -294,8 +294,13 @@ export default {
       defDataIndex: [
         'action',
         'name',
+        'sku',
         'brand',
+        'standard',
+        'model',
+        'color',
         'systemSpu',
+        'expiryNum',
         'mnemonic',
         'categoryName',
         'materialOther',
@@ -316,11 +321,17 @@ export default {
         },
         { title: '图片', dataIndex: 'pic', width: 80, scopedSlots: { customRender: 'customPic' } },
         { title: '名称', dataIndex: 'name', width: 160, scopedSlots: { customRender: 'customName' } },
-        { title: '品牌', dataIndex: 'brand', width: 120, ellipsis: true},
         { title: '系统SPU', dataIndex: 'systemSpu', width: 120 },
+        { title: '保质期(天)', dataIndex: 'expiryNum', width: 120 },
+        { title: 'SKU', dataIndex: 'sku', width: 120},
+        { title: '规格', dataIndex: 'standard', width: 120 },
+        { title: '型号', dataIndex: 'model', width: 120 },
+        { title: '颜色', dataIndex: 'color', width: 120 },
+        { title: '品牌', dataIndex: 'brand', width: 120},
         { title: '助记码', dataIndex: 'mnemonic', width: 80, ellipsis: true },
         { title: '类别', dataIndex: 'categoryName', width: 100, ellipsis: true },
         { title: '扩展信息', dataIndex: 'materialOther', width: 100, ellipsis: true },
+        { title: '单位', dataIndex: 'commodityUnit', width: 120},
         { title: '重量(kg)', dataIndex: 'weight', width: 80 },
         {
           title: '初始库存',

jshERP-web/src/views/material/mixins/MaterialModalMixins.js

@@ -6,10 +6,6 @@ export const MaterialModalMixins = {
     return {
       supList: [],
       depotList: [],
-      quickBtn: {
-        vendor: false,
-        depot: false,
-      },
     }
   },
   methods: {
@@ -36,6 +32,14 @@ export const MaterialModalMixins = {
         }
       })
     },
+    formatDepotName(id){
+      const target = this.depotList.find(item => item.value == id)
+      return target ? target.title : ''
+    },
+    formatSupplierName(id){
+      const target = this.supList.find(item => item.id == id)
+      return target ? target.supplier : ''
+    },
     //初始化下拉选项
     initSelectOpts() {
       this.initSupplier()

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

@@ -20,6 +20,11 @@
         <a-form :form="form">
           <a-row class="form-row" :gutter="24">
             <a-col :md="8" :sm="24">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="保质期">
+                <a-input-number style="width: 100%" placeholder="请输入保质期(天)" v-decorator.trim="['expiryNum']" />
+              </a-form-item>
+            </a-col> 
+            <a-col :md="8" :sm="24">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="类别">
                 <a-tree-select
                   style="width: 100%"

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

@@ -332,8 +332,6 @@ import MaterialUpcModal from './MaterialUpcModal'
 import JEditableTable from '@/components/jeecg/JEditableTable'
 import { FormTypes, getRefPromise, VALIDATE_NO_PASSED, validateFormAndTables } from '@/utils/JEditableTableUtil'
 import {
-  checkMaterial,
-  checkMaterialBarCode,
   queryMaterialCategoryTreeList,
   changeNameToPinYin,
 } from '@/api/api'
@@ -409,19 +407,11 @@ export default {
             scopedSlots: { customRender: 'purchaseDecimal' } 
           },
           {
-            title: '零售价',
-            dataIndex: 'commodityDecimal',
-          },
-          {
             title: '销售价',
             dataIndex: 'wholesaleDecimal',
             scopedSlots: { customRender: 'wholesaleDecimal' } 
           },
           {
-            title: '最低售价',
-            dataIndex: 'lowDecimal',
-          },
-          {
             title: '生产日期',
             dataIndex: 'productionDate',
           },
@@ -608,7 +598,6 @@ export default {
         depotWithStock: '/depot/getAllListWithStock',
         batchList: '/materialBatch/getDetailList',
       },
-      barCodeUnitList: [],
     }
   },
   created() {
@@ -624,14 +613,6 @@ export default {
     document.getElementById(this.prefixNo).removeEventListener('keydown', this.handleOkKey)
   },
   methods: {
-    formatDepotName(id){
-      const target = this.depotList.find(item => item.value == id)
-      return target ? target.title : ''
-    },
-    formatSupplierName(id){
-      const target = this.supList.find(item => item.id == id)
-      return target ? target.supplier : ''
-    },
     // 快捷键
     handleOkKey(e) {
       const key = window.event.keyCode ? window.event.keyCode : window.event.which
@@ -791,14 +772,10 @@ export default {
           }
         })
     },
-    async getUnitListByID(id){
-      await getAction('/unit/getUnitListByID', { id}).then(res => {
-        this.barCodeUnitList = res.data || []
-      })
-    },
     /** 整理成formData */
     classifyIntoFormData(allValues) {
       let materialMain = Object.assign(this.model, allValues.formValue)
+      console.log('allValues.tablesValue[0].values',allValues.tablesValue[0].values)
       return {
         ...materialMain, // 展开
         stock: allValues.tablesValue[1].values,
@@ -870,26 +847,6 @@ export default {
         })
         .finally(() => {})
     },
-    parseParam(param) {
-      return param ? param : ''
-    },
-    validateBarCode(type, value, row, column, callback, target) {
-      let params = {
-        barCode: value,
-        id: row.id.length >= 20 ? 0 : row.id,
-      }
-      checkMaterialBarCode(params).then((res) => {
-        if (res && res.code === 200) {
-          if (!res.data.status) {
-            callback(true)
-          } else {
-            callback(false, '该条码已经存在')
-          }
-        } else {
-          callback(false, res.data)
-        }
-      })
-    },
     loadTreeData() {
       let that = this
       let params = {}
@@ -1007,7 +964,6 @@ export default {
       this.$refs.materialUnitModal.unitOpts = this.unitList
     },
     editMaterialUpcModal({value,rowId}) {
-      console.log('value====',value)
       let upcList = [
         {
           upc: ''

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

@@ -19,7 +19,10 @@
         <a-form-model :model="model" :label-col="labelCol" :wrapper-col="wrapperCol" ref="form" :rules="rules">
           <a-row :gutter="24">
             <a-col :span="24" v-for="(item, index) in model.upcList" :key="index">
-              <a-form-model-item :label="`UPC${index + 1}`">
+              <a-form-model-item :label="`UPC${index + 1}`" :prop="`upcList[${index}].upc`" :rules="{
+                validator: (rule, value, callback) => validatorUPC(rule, value, callback, item),
+                trigger: 'blur',
+              }">
                 <a-input placeholder="请输入" v-model="item.upc" style="width: 200px" />
                 <a-icon type="delete" @click="upcDel(index)" style="margin-left: 10px;color:#f5222d"></a-icon>
               </a-form-model-item>
@@ -39,12 +42,13 @@
 
 <script>
 import { mixinDevice } from '@/utils/mixin'
+import { cloneDeep } from 'lodash'
+import { getAction } from '@/api/manage'
 
 export default {
   name: 'MaterialUpcModal',
   mixins: [mixinDevice],
   data() {
-    const that = this
     return {
       title: '管理UPC',
       visible: false,
@@ -62,6 +66,7 @@ export default {
       confirmLoading: false,
       rules: {},
       rowId: null,
+      rawUpcMap: {}, // 用于存储原始的UPC列表
     }
   },
   created() {},
@@ -69,24 +74,52 @@ export default {
     edit({upcList=[],rowId}) {
       this.visible = true
       this.rowId = rowId
-      this.$nextTick(() => {
-        this.$refs.form.resetFields()
-      })
-      this.model = Object.assign({}, {upcList})
+      console.log('edit', upcList, rowId)
+      this.model = cloneDeep({upcList})
+      this.rawUpcMap = upcList.reduce((map, item) => {
+        if(item.id){
+          map[item.id] = item.upc
+        }
+        return map
+      }, {})
     },
     close() {
       this.$emit('close')
-      this.model = {
-        upcList: []
-      }
       this.visible = false
+      this.$refs.form.resetFields()
+      this.$nextTick(() => {
+        this.model = {
+          upcList: []
+        }
+        this.rowId = null
+        this.rawUpcMap = {}
+      })
     },
     handleOk() {
-      this.$emit('ok', {
-        upcList: this.model.upcList,
-        rowId: this.rowId
+      // 保存之前校验
+      this.$refs.form.validate(async (valid) => {
+        if (valid) {
+          this.$emit('ok', {
+            upcList: cloneDeep(this.model.upcList),
+            rowId: this.rowId
+          })
+          this.visible = false
+        }
       })
-      this.visible = false
+    },
+    async validatorUPC(rule, value, callback, item) {
+      if(value) {
+        if(item.id&&this.rawUpcMap[item.id]==value) {
+          callback()
+          return
+        }
+        const res = await getAction('/materialsExtend/checkIsUpcExist', { upc: value,id: item.id || '' })
+        if (res.data) {
+          callback(new Error(res.msg))
+          return
+        }
+      }
+      callback()
     },
     handleCancel() {
       this.close()

jshERP-web/src/views/report/InDetail.vue

@@ -10,7 +10,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input
-                    placeholder="请输入条码、名称、助记码、规格、型号等信息"
+                    placeholder="请输入SKU、名称、助记码、规格、型号等信息"
                     v-model="queryParam.materialParam"
                   ></a-input>
                 </a-form-item>
@@ -273,7 +273,7 @@ export default {
       defDataIndex: [
         'rowIndex',
         'number',
-        'barCode',
+        'sku',
         'mname',
         'standard',
         'model',
@@ -305,7 +305,7 @@ export default {
           width: 100,
           scopedSlots: { customRender: 'numberCustomRender' },
         },
-        { title: '条码', dataIndex: 'barCode', sorter: (a, b) => a.barCode - b.barCode, width: 80 },
+        { title: 'SKU', dataIndex: 'sku', width: 80 },
         { title: '名称', dataIndex: 'mname', width: 120, ellipsis: true },
         { title: '规格', dataIndex: 'standard', width: 60, ellipsis: true },
         { title: '型号', dataIndex: 'model', width: 60, ellipsis: true },
@@ -313,7 +313,6 @@ export default {
         { title: '品牌', dataIndex: 'brand', width: 60, ellipsis: true },
         { title: '制造商', dataIndex: 'mfrs', width: 60, ellipsis: true },
         { title: '单位', dataIndex: 'mUnit', width: 50, ellipsis: true },
-        { title: '多属性', dataIndex: 'sku', width: 100, ellipsis: true },
         { title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60 },
         { title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60 },
         { title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60 },
@@ -439,13 +438,13 @@ export default {
     exportExcel() {
       let list = []
       let head =
-        '单据编号,条码,名称,规格,型号,颜色,品牌,制造商,单位,多属性,数量,单价,金额,税率(%),税额,往来单位,仓库,入库日期,备注'
+        '单据编号,SKU,名称,规格,型号,颜色,品牌,制造商,单位,数量,单价,金额,税率(%),税额,往来单位,仓库,入库日期,备注'
       for (let i = 0; i < this.dataSource.length; i++) {
         let item = []
         let ds = this.dataSource[i]
         item.push(
           ds.number,
-          ds.barCode,
+          ds.sku,
           ds.mname,
           ds.standard,
           ds.model,
@@ -453,7 +452,6 @@ export default {
           ds.brand,
           ds.mfrs,
           ds.mUnit,
-          ds.sku,
           ds.operNumber,
           ds.unitPrice,
           ds.allPrice,

jshERP-web/src/views/report/OutDetail.vue

@@ -10,7 +10,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-input
-                    placeholder="请输入条码、名称、助记码、规格、型号等信息"
+                    placeholder="请输入SKU、名称、助记码、规格、型号等信息"
                     v-model="queryParam.materialParam"
                   ></a-input>
                 </a-form-item>
@@ -273,7 +273,7 @@ export default {
       defDataIndex: [
         'rowIndex',
         'number',
-        'barCode',
+        'sku',
         'mname',
         'standard',
         'model',
@@ -305,7 +305,7 @@ export default {
           width: 100,
           scopedSlots: { customRender: 'numberCustomRender' },
         },
-        { title: '条码', dataIndex: 'barCode', sorter: (a, b) => a.barCode - b.barCode, width: 80 },
+        { title: 'SKU', dataIndex: 'sku', width: 80 },
         { title: '名称', dataIndex: 'mname', width: 120, ellipsis: true },
         { title: '规格', dataIndex: 'standard', width: 60, ellipsis: true },
         { title: '型号', dataIndex: 'model', width: 60, ellipsis: true },
@@ -313,7 +313,6 @@ export default {
         { title: '品牌', dataIndex: 'brand', width: 60, ellipsis: true },
         { title: '制造商', dataIndex: 'mfrs', width: 60, ellipsis: true },
         { title: '单位', dataIndex: 'mUnit', width: 50, ellipsis: true },
-        { title: '多属性', dataIndex: 'sku', width: 100, ellipsis: true },
         { title: '数量', dataIndex: 'operNumber', sorter: (a, b) => a.operNumber - b.operNumber, width: 60 },
         { title: '单价', dataIndex: 'unitPrice', sorter: (a, b) => a.unitPrice - b.unitPrice, width: 60 },
         { title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60 },
@@ -439,13 +438,13 @@ export default {
     exportExcel() {
       let list = []
       let head =
-        '单据编号,条码,名称,规格,型号,颜色,品牌,制造商,单位,多属性,数量,单价,金额,税率(%),税额,往来单位,仓库,出库日期,备注'
+        '单据编号,SKU,名称,规格,型号,颜色,品牌,制造商,单位,数量,单价,金额,税率(%),税额,往来单位,仓库,出库日期,备注'
       for (let i = 0; i < this.dataSource.length; i++) {
         let item = []
         let ds = this.dataSource[i]
         item.push(
           ds.number,
-          ds.barCode,
+          ds.sku,
           ds.mname,
           ds.standard,
           ds.model,
@@ -453,7 +452,6 @@ export default {
           ds.brand,
           ds.mfrs,
           ds.mUnit,
-          ds.sku,
           ds.operNumber,
           ds.unitPrice,
           ds.allPrice,

jshERP-web/src/views/stock/CheckList.vue

@@ -1,7 +1,7 @@
 <template>
   <a-row :gutter="24">
     <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :bordered="false" :style="cardStyle">
         <!-- 查询区域 -->
         <filter-form
           @search="onSearch"
@@ -68,13 +68,15 @@ import table from './utils/table'
 import { getAction, postAction } from '@/api/manage'
 import { newTableMixin } from '@/mixins/newTableMixin'
 import CheckModal from './components/checkModal.vue'
+import { mixinDevice } from '@/utils/mixin.js'
 
 export default {
   components: { FilterForm, CheckModal },
-  mixins: [newTableMixin],
+  mixins: [newTableMixin,mixinDevice],
   data() {
     return {
       description: '盘点任务列表',
+      cardStyle: '',
       // 表头
       scroll: { x: 1500 },
       // 权限按钮集合
@@ -131,6 +133,9 @@ export default {
     },
   },
   created() {
+    if (this.isDesktop()) {
+      this.cardStyle = 'min-height:' + (document.documentElement.clientHeight - 100) + 'px'
+    }
     this.getList()
     this.getSpinnerList(), this.getDepotList()
   },

jshERP-web/src/views/stock/TaskList.vue

@@ -1,7 +1,7 @@
 <template>
   <a-row :gutter="24">
     <a-col :md="24">
-      <a-card :bordered="false">
+      <a-card :bordered="false" :style="cardStyle">
         <!-- 查询区域 -->
         <filter-form
           @search="onSearch"
@@ -83,13 +83,15 @@ import table from './utils/table'
 import StockModal from './components/stockModal.vue'
 import { getAction, postAction } from '@/api/manage'
 import { newTableMixin } from '@/mixins/newTableMixin'
+import { mixinDevice } from '@/utils/mixin.js'
 
 export default {
   components: { FilterForm, StockModal },
-  mixins: [newTableMixin],
+  mixins: [newTableMixin,mixinDevice],
   data() {
     return {
       description: '盘点任务列表',
+      cardStyle: '',
       // 表头
       scroll: { x: 1500 },
       // 权限按钮集合
@@ -158,6 +160,9 @@ export default {
   },
 
   created() {
+    if (this.isDesktop()) {
+      this.cardStyle = 'min-height:' + (document.documentElement.clientHeight - 100) + 'px'
+    }
     this.getList()
     this.getSpinnerList(), this.getDepotList()
   },

jshERP-web/src/views/stock/components/FilterForm.vue

@@ -11,7 +11,7 @@
         </a-col>
         <a-col :md="5" :sm="24">
           <a-form-item label="盘点单号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-input placeholder="请输入条码、名称" v-model="queryParam.number"></a-input>
+            <a-input placeholder="请输入SKU、名称" v-model="queryParam.number"></a-input>
           </a-form-item>
         </a-col>
         <a-col :md="5" :sm="24">

jshERP-web/src/views/stock/utils/table.js

@@ -61,9 +61,8 @@ const table = {
       width: 90,
       scopedSlots: { customRender: 'action' },
     },
-    { dataIndex: 'id', title: 'id' },
+    // { dataIndex: 'id', title: 'id' },
 
-    // { dataIndex: 'mBarCode', title: '条码', scopedSlots: { customRender: 'customBarCode' } },
     { dataIndex: 'batchNumber', title: '批次号' },
     { dataIndex: 'materialName', title: '商品名称', scopedSlots: { customRender: 'customName' } },
     { dataIndex: 'categoryName', title: '类别' },
@@ -73,23 +72,22 @@ const table = {
     { dataIndex: 'brand', title: '品牌' },
     { dataIndex: 'supplierName', title: '供应商' },
     { dataIndex: 'commodityUnit', title: '单位' },
-    { dataIndex: 'sku', title: '多属性' },
     { dataIndex: 'inventory', title: '库存', scopedSlots: { customRender: 'inventory' } },
     { dataIndex: 'productionDate', title: '生产日期' },
     { dataIndex: 'expiryNum', title: '保质期' },
-    { dataIndex: 'barCode', title: 'SKU' },
+    { dataIndex: 'sku', title: 'SKU' },
     { dataIndex: 'depotName', title: '仓库名称' },
     { dataIndex: 'position', title: '仓库货架' },
   ],
   checkGoodsColumns: [
     { dataIndex: 'categoryName', title: '商品类别' },
     { dataIndex: 'materialName', title: '商品名称' },
-    { dataIndex: 'systemSku', title: '系统SKU' },
+    { dataIndex: 'systemSpu', title: '系统SPU' },
     { dataIndex: 'batchNumber', title: '批次号' },
     { dataIndex: 'commodityUnit', title: '单位' },
     { dataIndex: 'productionDate', title: '生产日期' },
     { dataIndex: 'supplierName', title: '供应商' },
-    { dataIndex: 'barCode', title: 'SKU' },
+    { dataIndex: 'sku', title: 'SKU' },
     { dataIndex: 'inventory', title: '库存(最小单位)', scopedSlots: { customRender: 'inventory' } },
     { dataIndex: 'depotName', title: '仓库名称' },
     { dataIndex: 'position', title: '仓库货架' },

jshERP-web/src/views/system/modules/VendorModal.vue

@@ -6,7 +6,6 @@
       :visible="visible"
       :confirmLoading="confirmLoading"
       :getContainer="() => $refs.container"
-      :maskStyle="{ top: '93px', left: '154px' }"
       :wrapClassName="wrapClassNameInfo()"
       :mask="isDesktop()"
       :maskClosable="false"

jshERP-web/src/views/task/ApprovalList.vue

@@ -8,20 +8,19 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入单据编号" v-model="queryParam.loginName"></a-input>
+                  <a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="流程类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select v-model="queryParam.processType" placeholder="请选择流程类型">
-                    <a-select-option value="0">全部</a-select-option>
-                    <a-select-option value="1">请假</a-select-option>
+                  <a-select v-model="queryParam.type" allowClear placeholder="请选择流程类型">
+                    <a-select-option v-for="item in flowTypes" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
                   </a-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入发起人" v-model="queryParam.loginName"></a-input>
+                  <a-input placeholder="请输入审核发起人" v-model="queryParam.initiatorName"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -45,33 +44,38 @@
             :pagination="ipagination"
             :scroll="scroll"
             :loading="loading"
-            :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             @change="handleTableChange"
           >
             <span slot="action" slot-scope="text, record">
-              <a @click="">查看</a>
-              <a-divider type="vertical" />
-              <a-popconfirm
-                title="确定删除吗?"
-                @confirm="() => handleDelete(record.id)"
-              >
-                <a>删除</a>
-              </a-popconfirm>
+              <a @click="goApproval(record,true)">详情</a>
+              <a @click="goApproval(record,false)" style="margin-left: 8px;">审批</a>
             </span>
+            <template slot="auditStatus" slot-scope="status">
+              <a-tag v-if="status == 0" color="blue">待审批</a-tag>
+              <a-tag v-if="status == 1" color="green">已通过</a-tag>
+              <a-tag v-if="status == 2" color="red">未通过</a-tag>
+            </template>
           </a-table>
         </div>
         <!-- table区域-end -->
       </a-card>
     </a-col>
+    <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
   </a-row>
 </template>
 <script>
 import { postAction } from '@/api/manage'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { approvalMixin } from './mixin/approvalMixin'
+import { flowTypes } from './utils/flow'
+import BillDetail from '@/views/bill/dialog/BillDetail.vue'
+
 export default {
   name: 'ApprovalList',
-  mixins: [JeecgListMixin],
-  components: {},
+  mixins: [JeecgListMixin,approvalMixin],
+  components: {
+    BillDetail
+  },
   data() {
     return {
       labelCol: {
@@ -81,17 +85,11 @@ export default {
         span: 18,
         offset: 1,
       },
+      flowTypes,
       queryParam: {},
       depotFlag: '0',
       customerFlag: '0',
       columns: [
-        { title: '单据编号', dataIndex: 'number', width: 100, align: 'left' },
-        { title: '流程类型', dataIndex: 'username', width: 100, align: 'left' },
-        { title: '发起人', dataIndex: 'userType', width: 80, align: 'left' },
-        { title: '审核人', dataIndex: 'roleName', width: 100, align: 'left' },
-        { title: '创建时间', dataIndex: 'orgAbr', width: 100, align: 'left' },
-        { title: '审批时间', dataIndex: 'leaderFlagStr', width: 60, align: 'left' },
-        { title: '审批结果', dataIndex: 'phonenum', width: 80, align: 'left' },
         {
           title: '操作',
           dataIndex: 'action',
@@ -99,24 +97,44 @@ export default {
           align: 'center',
           width: 100,
         },
+        { title: '单据编号', dataIndex: 'number', align: 'left' },
+        { title: '流程类型', dataIndex: 'type', align: 'left' },
+        { title: '发起人', dataIndex: 'initiatorName', align: 'left' },
+        { title: '审核人', dataIndex: 'auditorName', align: 'left' },
+        { title: '创建时间', dataIndex: 'submitTime',width: 170, align: 'left'},
+        { title: '审批状态', dataIndex: 'auditStatus', align: 'left',scopedSlots: { customRender: 'auditStatus' }},
       ],
       url: {
-        list: '',
-        delete: '',
+        list: '/audit/pendingApprovalList',
       },
     }
   },
   created() {
   },
   methods: {
-    searchQuery() {
-      this.loadData(1)
-      this.getSystemConfig()
-    },
-    searchReset() {
-      this.queryParam = {}
-      this.loadData(1)
-      this.getSystemConfig()
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error('请设置url.list属性!')
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1
+      }
+      this.loading = true
+      const url = this.url.list + '?currentPage=' + this.ipagination.current + '&pageSize=' + this.ipagination.pageSize
+      postAction(url, {
+        ...this.queryParam
+      }).then((res) => {
+        if (res.code === 200) {
+          this.dataSource = res.data.rows
+          this.ipagination.total = Number(res.data.total)
+        }else {
+          this.$message.warning(res.msg)
+        }
+        this.loading = false
+        this.onClearSelected()
+      })
     },
   },
 }

jshERP-web/src/views/task/FlowList.vue

@@ -8,9 +8,8 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="流程类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select v-model="queryParam.processType" placeholder="请选择流程类型">
-                    <a-select-option value="0">全部</a-select-option>
-                    <a-select-option value="1">请假</a-select-option>
+                  <a-select v-model="queryParam.type" allowClear placeholder="请选择流程类型">
+                    <a-select-option v-for="item in flowTypes" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
                   </a-select>
                 </a-form-item>
               </a-col>
@@ -23,6 +22,11 @@
             </a-row>
           </a-form>
         </div>
+        <!-- 操作按钮区域 -->
+        <div class="table-operator" style="margin-top: 5px">
+          <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+          <a-button icon="delete" @click="batchDel">删除</a-button>
+        </div>
         <!-- table区域-begin -->
         <div>
           <a-table
@@ -38,14 +42,18 @@
             :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             @change="handleTableChange"
           >
+            <span slot="auditNode1" slot-scope="text, record"> {{ getAuditNodeText(record,1) }} </span>
+            <span slot="auditNode2" slot-scope="text, record"> {{ getAuditNodeText(record,2) }} </span>
+            <span slot="auditNode3" slot-scope="text, record"> {{ getAuditNodeText(record,3) }} </span>
+            <span slot="auditNode4" slot-scope="text, record"> {{ getAuditNodeText(record,4) }} </span>
             <span slot="action" slot-scope="text, record">
-              <a @click="">查看</a>
-              <a-divider type="vertical" />
+              <a @click="showDetail(record)">详情</a>
+              <a @click="handleEdit(record)" style="margin-left: 8px;">编辑</a>
               <a-popconfirm
                 title="确定删除吗?"
                 @confirm="() => handleDelete(record.id)"
               >
-                <a>删除</a>
+                <a style="margin-left: 8px;">删除</a>
               </a-popconfirm>
             </span>
           </a-table>
@@ -53,15 +61,20 @@
         <!-- table区域-end -->
       </a-card>
     </a-col>
+    <FlowModal ref="modalForm" @ok="modalFormOk" />
   </a-row>
 </template>
 <script>
 import { postAction } from '@/api/manage'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import FlowModal from './modules/FlowModal.vue'
+import { flowTypes,approvers } from './utils/flow'
 export default {
   name: 'FlowList',
   mixins: [JeecgListMixin],
-  components: {},
+  components: {
+    FlowModal
+  },
   data() {
     return {
       labelCol: {
@@ -71,16 +84,9 @@ export default {
         span: 18,
         offset: 1,
       },
+      flowTypes,
       queryParam: {},
-      depotFlag: '0',
-      customerFlag: '0',
       columns: [
-        { title: '流程类型', dataIndex: 'username', width: 100, align: 'left' },
-        { title: '流程节点1', dataIndex: 'userType', width: 80, align: 'left' },
-        { title: '流程节点2', dataIndex: 'roleName', width: 100, align: 'left' },
-        { title: '流程节点3', dataIndex: 'orgAbr', width: 100, align: 'left' },
-        { title: '流程节点4', dataIndex: 'leaderFlagStr', width: 60, align: 'left' },
-        { title: '备注', dataIndex: 'phonenum', width: 80, align: 'left' },
         {
           title: '操作',
           dataIndex: 'action',
@@ -88,24 +94,67 @@ export default {
           align: 'center',
           width: 100,
         },
+        { title: '流程类型', dataIndex: 'type', width: 100, align: 'left' },
+        { title: '流程节点1', dataIndex: 'auditNode1', width: 100, scopedSlots: { customRender: 'auditNode1' }, align: 'left' },
+        { title: '流程节点2', dataIndex: 'auditNode2', width: 100, scopedSlots: { customRender: 'auditNode2' }, align: 'left' },
+        { title: '流程节点3', dataIndex: 'auditNode3', width: 100, scopedSlots: { customRender: 'auditNode3' }, align: 'left' },
+        { title: '流程节点4', dataIndex: 'auditNode4', width: 100, scopedSlots: { customRender: 'auditNode4' }, align: 'left' },
+        { title: '备注', dataIndex: 'description', width: 100, align: 'left' },
       ],
+      approvers,
       url: {
-        list: '',
-        delete: '',
+        list: '/auditProcess/list',
+        delete: '/auditProcess/delete',
+        deleteBatch: '/auditProcess/deleteBatch'
       },
     }
   },
   created() {
   },
   methods: {
-    searchQuery() {
-      this.loadData(1)
-      this.getSystemConfig()
+    getAuditNodeText(record,step){
+      const obj = record.auditNodes[step-1]
+      if(obj){
+        if(obj.auditorType==2||obj.auditorType==3){
+          const target = this.approvers.find(item => item.value == obj.auditorType)
+          return target.label
+        }
+        return obj.auditorName
+      }
+      return ''
+    },
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error('请设置url.list属性!')
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1
+      }
+      this.loading = true
+      const url = this.url.list + '?currentPage=' + this.ipagination.current + '&pageSize=' + this.ipagination.pageSize
+      postAction(url, {
+        ...this.queryParam
+      }).then((res) => {
+        if (res.code === 200) {
+          this.dataSource = res.data.rows
+          this.ipagination.total = Number(res.data.total)
+        }else {
+          this.$message.warning(res.msg)
+        }
+        this.loading = false
+        this.onClearSelected()
+      })
+    },
+    showDetail(record){
+      this.$refs.modalForm.show(record)
+    },
+    handleEdit(record){
+      this.$refs.modalForm.edit(record)
     },
-    searchReset() {
-      this.queryParam = {}
-      this.loadData(1)
-      this.getSystemConfig()
+    handleAdd: function () {
+      this.$refs.modalForm.add()
     },
   },
 }

jshERP-web/src/views/task/HandledList.vue

@@ -8,48 +8,51 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入单据编号" v-model="queryParam.loginName"></a-input>
+                  <a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="流程类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select v-model="queryParam.processType" placeholder="请选择流程类型">
-                    <a-select-option value="0">全部</a-select-option>
-                    <a-select-option value="1">请假</a-select-option>
+                  <a-select v-model="queryParam.type" allowClear placeholder="请选择流程类型">
+                    <a-select-option v-for="item in flowTypes" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
                   </a-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select v-model="queryParam.processType" placeholder="请选择状态">
-                    <a-select-option value="0">全部</a-select-option>
-                    <a-select-option value="1">请假</a-select-option>
-                    <a-select-option value="2">报销</a-select-option>
-                    <a-select-option value="3">采购</a-select-option>
+                  <a-select v-model="queryParam.auditStatus" allowClear placeholder="请选择状态">
+                    <a-select-option :value="1" :key="1">审批完成</a-select-option>
+                    <a-select-option :value="2" :key="2">审批未通过</a-select-option>
                   </a-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="审核时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-range-picker
-                    style="width: 100%"
-                    v-model="queryParam.createTimeRange"
-                    format="YYYY-MM-DD"
-                    :placeholder="['开始时间', '结束时间']"
-                  />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
-                <a-form-item label="发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入发起人" v-model="queryParam.loginName"></a-input>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
                 <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
                   <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                    {{ toggleSearchStatus ? '收起' : '展开' }}
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
+                  </a>
                 </span>
               </a-col>
+              <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="审核时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-range-picker
+                      style="width: 100%"
+                      v-model="queryParam.auditTimeRange"
+                      format="YYYY-MM-DD"
+                      :placeholder="['开始时间', '结束时间']"
+                    />
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="发起人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-input placeholder="请输入发起人" v-model="queryParam.initiatorName"></a-input>
+                  </a-form-item>
+                </a-col>
+              </template>
             </a-row>
           </a-form>
         </div>
@@ -65,63 +68,69 @@
             :pagination="ipagination"
             :scroll="scroll"
             :loading="loading"
-            :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             @change="handleTableChange"
           >
             <span slot="action" slot-scope="text, record">
-              <a @click="">查看</a>
-              <a-divider type="vertical" />
-              <a-popconfirm
-                title="确定删除吗?"
-                @confirm="() => handleDelete(record.id)"
-              >
-                <a>删除</a>
-              </a-popconfirm>
+              <a @click="goApproval(record,true)">详情</a>
             </span>
+            <template slot="auditStatus" slot-scope="status">
+              <a-tag v-if="status == 0" color="blue">待审批</a-tag>
+              <a-tag v-if="status == 1" color="green">审批完成</a-tag>
+              <a-tag v-if="status == 2" color="red">审批未通过</a-tag>
+            </template>
           </a-table>
         </div>
         <!-- table区域-end -->
       </a-card>
     </a-col>
+    <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
   </a-row>
 </template>
 <script>
 import { postAction } from '@/api/manage'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { approvalMixin } from './mixin/approvalMixin'
+import { flowTypes } from './utils/flow'
+import BillDetail from '@/views/bill/dialog/BillDetail.vue'
+import { cloneDeep } from 'lodash'
+import moment from 'moment'
+
 export default {
   name: 'HandledList',
-  mixins: [JeecgListMixin],
-  components: {},
+  mixins: [JeecgListMixin,approvalMixin],
+  components: {
+    BillDetail
+  },
   data() {
     return {
       labelCol: {
-        span: 5,
+        span: 4,
       },
       wrapperCol: {
-        span: 18,
-        offset: 1,
+        span: 20,
       },
+      flowTypes,
       queryParam: {},
       depotFlag: '0',
       customerFlag: '0',
       columns: [
-        { title: '单据编号', dataIndex: 'number', width: 100, align: 'left' },
-        { title: '流程类型', dataIndex: 'username', width: 100, align: 'left' },
-        { title: '发起人', dataIndex: 'userType', width: 80, align: 'left' },
-        { title: '审核人', dataIndex: 'roleName', width: 100, align: 'left' },
-        { title: '创建时间', dataIndex: 'orgAbr', width: 100, align: 'left' },
-        { title: '审批时间', dataIndex: 'leaderFlagStr', width: 60, align: 'left' },
-        { title: '审批结果', dataIndex: 'phonenum', width: 80, align: 'left' },
         {
           title: '操作',
           dataIndex: 'action',
           scopedSlots: { customRender: 'action' },
           align: 'center',
-          width: 100,
+          width: 70,
         },
+        { title: '单据编号', dataIndex: 'number', align: 'left' },
+        { title: '流程类型', dataIndex: 'type', align: 'left' },
+        { title: '发起人', dataIndex: 'initiatorName', align: 'left' },
+        { title: '审核人', dataIndex: 'auditorName', align: 'left' },
+        { title: '创建时间', dataIndex: 'submitTime',width: 170, align: 'left' },
+        { title: '审批时间', dataIndex: 'auditTime', width: 170, align: 'left' },
+        { title: '审批结果', dataIndex: 'auditStatus', align: 'left',scopedSlots: { customRender: 'auditStatus' }},
       ],
       url: {
-        list: '',
+        list: '/audit/processedApprovalList',
         delete: '',
       },
     }
@@ -129,14 +138,32 @@ export default {
   created() {
   },
   methods: {
-    searchQuery() {
-      this.loadData(1)
-      this.getSystemConfig()
-    },
-    searchReset() {
-      this.queryParam = {}
-      this.loadData(1)
-      this.getSystemConfig()
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error('请设置url.list属性!')
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1
+      }
+      this.loading = true
+      const url = this.url.list + '?currentPage=' + this.ipagination.current + '&pageSize=' + this.ipagination.pageSize
+      const params = cloneDeep(this.queryParam)
+      const {auditTimeRange=[]} = params
+      params.beginTime = auditTimeRange[0]?moment(auditTimeRange[0]).format('YYYY-MM-DD'):''
+      params.endTime = auditTimeRange[1]?moment(auditTimeRange[1]).format('YYYY-MM-DD'):''
+      delete params.auditTimeRange
+      postAction(url, params).then((res) => {
+        if (res.code === 200) {
+          this.dataSource = res.data.rows
+          this.ipagination.total = Number(res.data.total)
+        }else {
+          this.$message.warning(res.msg)
+        }
+        this.loading = false
+        this.onClearSelected()
+      })
     },
   },
 }

jshERP-web/src/views/task/InitiateList.vue

@@ -8,43 +8,47 @@
             <a-row :gutter="24">
               <a-col :md="6" :sm="24">
                 <a-form-item label="单据编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入单据编号" v-model="queryParam.loginName"></a-input>
+                  <a-input placeholder="请输入单据编号" v-model="queryParam.number"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="流程类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select v-model="queryParam.processType" placeholder="请选择流程类型">
-                    <a-select-option value="0">全部</a-select-option>
-                    <a-select-option value="1">请假</a-select-option>
+                  <a-select v-model="queryParam.type" allowClear placeholder="请选择流程类型">
+                    <a-select-option v-for="item in flowTypes" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
                   </a-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select v-model="queryParam.processType" placeholder="请选择状态">
-                    <a-select-option value="0">全部</a-select-option>
-                    <a-select-option value="1">请假</a-select-option>
-                    <a-select-option value="2">报销</a-select-option>
-                    <a-select-option value="3">采购</a-select-option>
+                  <a-select v-model="queryParam.auditStatus" allowClear placeholder="请选择状态">
+                    <a-select-option :value="0">审批中</a-select-option>
+                    <a-select-option :value="1">审批完成</a-select-option>
+                    <a-select-option :value="2">审批未通过</a-select-option>
                   </a-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-range-picker
-                    style="width: 100%"
-                    v-model="queryParam.createTimeRange"
-                    format="YYYY-MM-DD"
-                    :placeholder="['开始时间', '结束时间']"
-                  />
-                </a-form-item>
-              </a-col>
-              <a-col :md="6" :sm="24">
                 <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
                   <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+                  <a @click="handleToggleSearch" style="margin-left: 8px">
+                    {{ toggleSearchStatus ? '收起' : '展开' }}
+                    <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
+                  </a>
                 </span>
               </a-col>
+              <template v-if="toggleSearchStatus">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="创建时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-range-picker
+                      style="width: 100%"
+                      v-model="queryParam.auditTimeRange"
+                      format="YYYY-MM-DD"
+                      :placeholder="['开始时间', '结束时间']"
+                    />
+                  </a-form-item>
+                </a-col>
+              </template>
             </a-row>
           </a-form>
         </div>
@@ -60,53 +64,73 @@
             :pagination="ipagination"
             :scroll="scroll"
             :loading="loading"
-            :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
             @change="handleTableChange"
           >
             <span slot="action" slot-scope="text, record">
-              <a @click="">查看</a>
-              <a-divider type="vertical" />
-              <a-popconfirm
-                title="确定删除吗?"
-                @confirm="() => handleDelete(record.id)"
-              >
-                <a>删除</a>
-              </a-popconfirm>
+              <a @click="goApproval(record,true)">详情</a>
+              <a @click="myHandleEdit(record)" v-if="record.auditStatus==2" style="margin-left: 8px;">编辑</a>
             </span>
+            <template slot="auditStatus" slot-scope="status">
+              <a-tag v-if="status == 0" color="blue">审批中</a-tag>
+              <a-tag v-if="status == 1" color="green">审批完成</a-tag>
+              <a-tag v-if="status == 2" color="red">审批未通过</a-tag>
+            </template>
           </a-table>
         </div>
         <!-- table区域-end -->
       </a-card>
     </a-col>
+    <bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
+    <OtherInModal ref="OtherInModal" @ok="modalFormOk" @close="modalFormClose" />
+    <OtherOutModal ref="OtherOutModal" @ok="modalFormOk" @close="modalFormClose" />
+    <PurchaseInModal ref="PurchaseInModal" @ok="modalFormOk" @close="modalFormClose" />
+    <PurchaseOrderModal ref="PurchaseOrderModal" @ok="modalFormOk" @close="modalFormClose" />
+    <SaleOrderModal ref="SaleOrderModal" @ok="modalFormOk" @close="modalFormClose" />
+    <SaleOutModal ref="SaleOutModal" @ok="modalFormOk" @close="modalFormClose" />
   </a-row>
 </template>
 <script>
 import { postAction } from '@/api/manage'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import { approvalMixin } from './mixin/approvalMixin'
+import { flowTypes } from './utils/flow'
+import BillDetail from '@/views/bill/dialog/BillDetail.vue'
+import moment from 'moment'
+import { cloneDeep } from 'lodash'
+import OtherInModal from '@/views/bill/modules/OtherInModal'
+import OtherOutModal from '@/views/bill/modules/OtherOutModal'
+import PurchaseInModal from '@/views/bill/modules/PurchaseInModal'
+import PurchaseOrderModal from '@/views/bill/modules/PurchaseOrderModal'
+import SaleOrderModal from '@/views/bill/modules/SaleOrderModal'
+import SaleOutModal from '@/views/bill/modules/SaleOutModal'
+import {
+  findBillDetailByNumber,
+} from '@/api/api'
 export default {
   name: 'InitiateList',
-  mixins: [JeecgListMixin],
-  components: {},
+  mixins: [JeecgListMixin,approvalMixin],
+  components: {
+    BillDetail,
+    OtherInModal,
+    OtherOutModal,
+    PurchaseInModal,
+    PurchaseOrderModal,
+    SaleOrderModal,
+    SaleOutModal,
+  },
   data() {
     return {
       labelCol: {
-        span: 5,
+        span: 4,
       },
       wrapperCol: {
-        span: 18,
-        offset: 1,
+        span: 20,
       },
+      flowTypes,
       queryParam: {},
       depotFlag: '0',
       customerFlag: '0',
       columns: [
-        { title: '单据编号', dataIndex: 'number', width: 100, align: 'left' },
-        { title: '流程类型', dataIndex: 'username', width: 100, align: 'left' },
-        { title: '发起人', dataIndex: 'userType', width: 80, align: 'left' },
-        { title: '审核人', dataIndex: 'roleName', width: 100, align: 'left' },
-        { title: '创建时间', dataIndex: 'orgAbr', width: 100, align: 'left' },
-        { title: '审批时间', dataIndex: 'leaderFlagStr', width: 60, align: 'left' },
-        { title: '审批结果', dataIndex: 'phonenum', width: 80, align: 'left' },
         {
           title: '操作',
           dataIndex: 'action',
@@ -114,9 +138,15 @@ export default {
           align: 'center',
           width: 100,
         },
+        { title: '单据编号', dataIndex: 'number', align: 'left' },
+        { title: '流程类型', dataIndex: 'type', align: 'left' },
+        { title: '发起人', dataIndex: 'initiatorName', align: 'left' },
+        { title: '当前审核人', dataIndex: 'auditorName', align: 'left' },
+        { title: '创建时间', dataIndex: 'submitTime', width: 170, align: 'left' },
+        { title: '状态', dataIndex: 'auditStatus', align: 'left',scopedSlots: { customRender: 'auditStatus' } },
       ],
       url: {
-        list: '',
+        list: '/audit/myApprovalList',
         delete: '',
       },
     }
@@ -124,14 +154,83 @@ export default {
   created() {
   },
   methods: {
-    searchQuery() {
-      this.loadData(1)
-      this.getSystemConfig()
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error('请设置url.list属性!')
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.ipagination.current = 1
+      }
+      this.loading = true
+      const url = this.url.list + '?currentPage=' + this.ipagination.current + '&pageSize=' + this.ipagination.pageSize
+      const params = cloneDeep(this.queryParam)
+      const {auditTimeRange=[]} = params
+      params.beginTime = auditTimeRange[0]?moment(auditTimeRange[0]).format('YYYY-MM-DD'):''
+      params.endTime = auditTimeRange[1]?moment(auditTimeRange[1]).format('YYYY-MM-DD'):''
+      delete params.auditTimeRange
+      postAction(url, params).then((res) => {
+        if (res.code === 200) {
+          this.dataSource = res.data.rows
+          this.ipagination.total = Number(res.data.total)
+        }else {
+          this.$message.warning(res.msg)
+        }
+        this.loading = false
+        this.onClearSelected()
+      })
+    },
+    myHandleEdit(record) {
+      let modalRefName = ''
+      switch (record.type) {
+        case '销售订单':
+          modalRefName = 'SaleOrderModal'
+          break;
+        case '销售出库':
+          modalRefName = 'SaleOutModal'
+          break;
+        case '其他入库':
+          modalRefName = 'OtherInModal'
+          break;
+        case '其他出库':
+          modalRefName = 'OtherOutModal'
+          break;
+        case '采购订单':
+          modalRefName = 'PurchaseOrderModal'
+          break;
+        case '采购入库':
+          modalRefName = 'PurchaseInModal'
+          break;
+        case '盘点任务':
+          
+          break;
+        case 'pda维护商品':
+          
+          break;
+      
+        default:
+          break;
+      }
+      if(!modalRefName){
+        return
+      }
+      this.$refs[modalRefName].action = 'edit'
+      if (this.btnEnableList.indexOf(2) === -1) {
+        this.$refs[modalRefName].isCanCheck = false
+      }
+      //查询单条单据信息
+      findBillDetailByNumber({ number: record.number }).then((res) => {
+        if (res && res.code === 200) {
+          let item = res.data
+          this.handleEdit(item,modalRefName)
+        }
+      })
     },
-    searchReset() {
-      this.queryParam = {}
-      this.loadData(1)
-      this.getSystemConfig()
+    handleEdit(record,modalRefName) {
+      this.$refs[modalRefName].edit(record)
+      this.$refs[modalRefName].title = '编辑'
+      this.$refs[modalRefName].disableSubmit = false
     },
   },
 }

jshERP-web/src/views/task/mixin/approvalMixin.js

@@ -0,0 +1,32 @@
+
+export const approvalMixin = {
+  methods:{
+    goApproval(record,approvalIsReadonly){
+      console.log('record===',record)
+      const target = this.flowTypes.find(item => item.value===record.type)
+      switch (record.type) {
+        case '销售订单':
+        case '销售出库':
+        case '其他入库':
+        case '其他出库':
+        case '采购订单':
+        case '采购入库':
+          this.$refs.modalDetail.show({number: record.number}, record.type, target.prefixNo, record)
+          this.$refs.modalDetail.approvalIsReadonly = approvalIsReadonly
+          if(approvalIsReadonly){
+            this.$refs.modalDetail.title = record.type + '-审核详情'
+          }else{
+            this.$refs.modalDetail.title = record.type + '-去审核'
+          }
+          break;
+        case '盘点任务':
+          break
+        case 'pda维护商品':
+          break
+        default:
+          break;
+      }
+
+    },
+  }
+}

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

@@ -0,0 +1,244 @@
+<template>
+  <div ref="container">
+    <a-modal
+      :title="title"
+      width="100%"
+      :visible="visible"
+      :confirmLoading="confirmLoading"
+      :getContainer="() => $refs.container"
+      :wrapClassName="wrapClassNameInfo()"
+      :mask="isDesktop()"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="handleCancel"
+      cancelText="取消"
+      okText="保存"
+      style="top: 0; height: 100%"
+    >
+      <template slot="footer">
+        <a-button key="back" v-if="isReadOnly" @click="handleCancel"> 取消 </a-button>
+      </template>
+      <a-spin :spinning="confirmLoading">
+        <a-form-model :model="model" ref="form" id="FlowModal" :rules="rules">
+          <a-row class="form-row" :gutter="24" type="flex">
+            <a-col :span="24 / 2">
+              <a-form-model-item label="流程类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="type">
+                <a-select v-model="model.type" allowClear placeholder="请选择流程类型" style="width: 100%;" :disabled="isReadOnly">
+                  <a-select-option v-for="item in flowTypes" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="24 / 2">
+              <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="流程备注" prop="description">
+                <a-input placeholder="请输入" v-model="model.description" :disabled="isReadOnly" />
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+          <a-row class="form-row" :gutter="24" type="flex" v-for="(item,index) in model.auditNodes" :key="index">
+            <a-col :span="24 / 2">
+              <a-form-model-item :label="`流程节点${index+1}`" :labelCol="labelCol" :wrapperCol="wrapperCol" :prop="`auditNodes[${index}].auditorType`" :rules="{
+                required: index===0,
+                message: '请选择',
+                trigger: 'change',
+              }">
+                <a-select v-model="item.auditorType" allowClear placeholder="请选择" style="width: 100%;" :disabled="isReadOnly" @change="changeAuditorType($event,index)">
+                  <a-select-option v-for="item in approvers" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :span="24 / 2">
+              <a-form-model-item :label="`审核人${index+1}`" :labelCol="labelCol" :wrapperCol="wrapperCol" :prop="`auditNodes[${index}].auditor`" :rules="item.auditorType===1?{
+                required: true,
+                message: '请选择',
+                trigger: 'change',
+              }:{}">
+                <a-select v-model="item.auditor" allowClear placeholder="请选择" :disabled="item.auditorType==2||item.auditorType==3||isReadOnly" style="width: 100%;">
+                  <a-select-option v-for="(item, index) in userList" :key="index" :value="item.id">
+                    {{ item.userName }}
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </a-spin>
+    </a-modal>
+  </div>
+</template>
+<script>
+import { cloneDeep } from 'lodash'
+import {
+  getUserList,
+} from '@/api/api'
+import { postAction } from '@/api/manage'
+import { autoJumpNextInput } from '@/utils/util'
+import { mixinDevice } from '@/utils/mixin'
+import { flowTypes,approvers } from '../utils/flow'
+export default {
+  name: 'FlowModal',
+  mixins: [mixinDevice],
+  data() {
+    return {
+      model: {
+        type: undefined,
+        description: '',
+        auditNodes: [
+          {
+            auditorType: undefined,
+            auditor: undefined,
+            nodeOrder: 1
+          },
+          {
+            auditorType: undefined,
+            auditor: undefined,
+            nodeOrder: 2
+          },
+          {
+            auditorType: undefined,
+            auditor: undefined,
+            nodeOrder: 3
+          },
+          {
+            auditorType: undefined,
+            auditor: undefined,
+            nodeOrder: 4
+          },
+        ],
+      },
+      userList: [],
+      title: '',
+      visible: false,
+      
+      flowTypes,
+      approvers,
+      isReadOnly: false,
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 },
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 18 },
+      },
+      confirmLoading: false,
+      rules: {
+        type: [
+          {required:true, message: '请选择流程类型', trigger: 'change'}
+        ]
+      },
+      url:{
+        add: '/auditProcess/add',
+        update: '/auditProcess/detailUpdate',
+      }
+    }
+  },
+  created() {
+    this.initUser()
+  },
+  methods: {
+    initUser() {
+      getUserList({}).then((res) => {
+        if (res) {
+          this.userList = res
+        }
+      })
+    },
+    resetModal(){
+      this.model = {
+        type: undefined,
+        description: '',
+        auditNodes: [
+          {
+            auditorType: undefined,
+            auditor: undefined,
+            nodeOrder: 1
+          },
+          {
+            auditorType: undefined,
+            auditor: undefined,
+            nodeOrder: 2
+          },
+          {
+            auditorType: undefined,
+            auditor: undefined,
+            nodeOrder: 3
+          },
+          {
+            auditorType: undefined,
+            auditor: undefined,
+            nodeOrder: 4
+          },
+        ]
+      }
+    },
+    show(record){
+      this.title = '详情'
+      this.visible = true
+      this.isReadOnly = true
+      this.model = cloneDeep(record)
+    },
+    add() {
+      this.title = '新增'
+      this.edit({})
+    },
+
+    edit(record) {
+      this.isReadOnly = false
+      this.title = '编辑'
+      this.visible = true
+      if(record.id){
+        this.model = cloneDeep(record)
+      }
+      this.$nextTick(() => {
+        autoJumpNextInput('FlowModal')
+      })
+    },
+    close() {
+      this.$emit('close')
+      this.$refs.form.resetFields()
+      this.visible = false
+      this.$nextTick(() => {
+        this.resetModal()
+      })
+    },
+    changeAuditorType(v,index){
+      this.$refs.form.clearValidate([`auditNodes[${index}].auditor`])
+      this.model.auditNodes[index].auditor = undefined
+      this.$forceUpdate()
+    },
+    handleOk() {
+      const that = this
+      // 触发表单验证
+      this.$refs.form.validate((flag, values) => {
+        if (flag) {
+          that.confirmLoading = true
+          let formData = Object.assign({}, this.model)
+          let obj
+          if (!this.model.id) {
+            obj = postAction(this.url.add,formData)
+          } else {
+            obj = postAction(this.url.update,formData)
+          }
+          obj
+            .then((res) => {
+              if (res.code === 200) {
+                that.$emit('ok')
+                that.close()
+              } else {
+                that.$message.warning(res.msg)
+              }
+            })
+            .finally(() => {
+              that.confirmLoading = false
+            })
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    },
+  },
+}
+</script>
+<style scoped>
+</style>

jshERP-web/src/views/task/utils/flow.js

@@ -0,0 +1,142 @@
+export const flowTypes = [
+  {
+    label: '销售订单',
+    value: '销售订单',
+    prefixNo: 'XSDD'
+  },
+  {
+    label: '销售出库',
+    value: '销售出库',
+    prefixNo: 'XSCK'
+  },
+  // {
+  //   label: '销售退货',
+  //   value: '销售退货',
+  //   prefixNo: 'XSTH'
+  // },
+  {
+    label: '其他入库',
+    value: '其他入库',
+    prefixNo: 'QTRK'
+  },
+  {
+    label: '其他出库',
+    value: '其他出库',
+    prefixNo: 'QTCK'
+
+  },
+  // {
+  //   label: '调拨出库',
+  //   value: '调拨出库',
+  //   prefixNo: 'DBCK'
+
+  // },
+  // {
+  //   label: '组装单',
+  //   value: '组装单',
+  //   prefixNo: 'ZZD'
+
+  // },
+  // {
+  //   label: '拆卸单',
+  //   value: '拆卸单',
+  //   prefixNo: 'CXD'
+
+  // },
+  // {
+  //   label: '零售出库',
+  //   value: '零售出库',
+  //   prefixNo: 'LSCK'
+
+  // },
+  // {
+  //   label: '零售退货',
+  //   value: '零售退货',
+  //   prefixNo: 'LSTH'
+  // },
+  // {
+  //   label: '请购单',
+  //   value: '请购单',
+  //   prefixNo: 'QGD'
+  // },
+  {
+    label: '采购订单',
+    value: '采购订单',
+    prefixNo: 'CGDD'
+  },
+  {
+    label: '采购入库',
+    value: '采购入库',
+    prefixNo: 'CGRK'
+  },
+  // {
+  //   label: '采购退货',
+  //   value: '采购退货',
+  //   prefixNo: 'CGTH'
+  // },
+  // {
+  //   label: '收款单',
+  //   value: '收款单',
+  //   prefixNo: 'SKD'
+  // },
+  // {
+  //   label: '付款单',
+  //   value: '付款单',
+  //   prefixNo: 'FKD'
+  // },
+  // {
+  //   label: '转账单',
+  //   value: '转账单',
+  //   prefixNo: 'ZZD'
+  // },
+  // {
+  //   label: '收入单',
+  //   value: '收入单',
+  //   prefixNo: 'SRD'
+  // },
+  // {
+  //   label: '支出单',
+  //   value: '支出单',
+  //   prefixNo: 'ZCD'
+  // },
+  {
+    label: '盘点任务',
+    value: '盘点任务',
+    prefixNo: 'PDRW'
+  },
+  {
+    label: 'pda维护商品',
+    value: 'pda维护商品',
+    prefixNo: 'PDAWHSP'
+  },
+]
+
+export const approvers = [
+  {
+    label: '部门最高领导审核',
+    value: 3
+  },
+  {
+    label: '上级部门最高领导审核',
+    value: 2
+  },
+  {
+    label: '指定用户',
+    value: 1
+  },
+]
+
+export const auditStatusList = [
+  {
+    label: '待审批',
+    value: 0
+  },
+  {
+    label: '已通过',
+    value: 1
+  },
+  {
+    label: '未通过',
+    value: 2
+  },
+]