Merge remote-tracking branch 'origin/xq'

jshERP-web/src/components/jeecg/JEditableTable.vue

@@ -946,13 +946,13 @@ import { getFileAccessHttpUrl } from '@/api/manage'
 import JInputPop from '@/components/jeecg/minipop/JInputPop'
 import JFilePop from '@/components/jeecg/minipop/JFilePop'
 import JSelectList from '@/components/jeecgbiz/JSelectList'
-import { BillModalMixin } from '../../../src/views/bill/mixins/BillModalMixin'
+// import { BillModalMixin } from '../../../src/views/bill/mixins/BillModalMixin'
 
 // 行高，需要在实例加载完成前用到
 let rowHeight = 42
 
 export default {
-  mixins: [BillModalMixin],
+  // mixins: [BillModalMixin],
   name: 'JEditableTable',
   components: {
     JDate,

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

@@ -1481,12 +1481,12 @@ import BillPrintIframe from './BillPrintIframe'
 import FinancialDetail from '../../financial/dialog/FinancialDetail'
 import JUpload from '@/components/jeecg/JUpload'
 import Vue from 'vue'
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+// import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 // import QrcodeVue from 'qrcode.vue'
 import VueQr from 'vue-qr'
 export default {
   name: 'BillDetail',
-  mixins: [JeecgListMixin],
+  // mixins: [JeecgListMixin],
   components: {
     BillPrintIframe,
     FinancialDetail,
@@ -1635,7 +1635,6 @@ export default {
         { title: '入库时间', dataIndex: 'warehousingTime', width: 90 },
 
         { title: '重量', dataIndex: 'weight', width: 90 },
-        { title: '仓位货架', dataIndex: 'position', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
       purchaseInColumns: [
@@ -1675,7 +1674,6 @@ export default {
         { title: '入库时间', dataIndex: 'warehousingTime', width: 90 },
 
         { title: '重量', dataIndex: 'weight', width: 90 },
-        { title: '仓位货架', dataIndex: 'position', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
       purchaseBackColumns: [
@@ -1743,7 +1741,6 @@ export default {
         { title: '出库时间', dataIndex: 'warehousingTime', width: 90 },
 
         { title: '重量', dataIndex: 'weight', width: 90 },
-        { title: '仓位货架', dataIndex: 'position', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
       saleOutColumns: [
@@ -1784,7 +1781,6 @@ export default {
         { title: '出库时间', dataIndex: 'warehousingTime', width: 90 },
 
         { title: '重量', dataIndex: 'weight', width: 90 },
-        { title: '仓位货架', dataIndex: 'position', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
       saleBackColumns: [
@@ -1847,7 +1843,6 @@ export default {
         { title: '入库时间', dataIndex: 'warehousingTime', width: 90 },
 
         { title: '重量', dataIndex: 'weight', width: 90 },
-        { title: '仓位货架', dataIndex: 'position', width: 90 },
       ],
       otherOutColumns: [
         { title: '批次号', dataIndex: 'batchNumber', width: 90 },
@@ -1883,7 +1878,6 @@ export default {
         { title: '出库时间', dataIndex: 'warehousingTime', width: 90 },
 
         { title: '重量', dataIndex: 'weight', width: 90 },
-        { title: '仓位货架', dataIndex: 'position', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
       allocationOutColumns: [
@@ -1919,7 +1913,6 @@ export default {
         { title: '出库时间', dataIndex: 'warehousingTime', width: 90 },
 
         { title: '重量', dataIndex: 'weight', width: 90 },
-        { title: '仓位货架', dataIndex: 'position', width: 90 },
         { title: '备注', dataIndex: 'remark', width: 90 },
       ],
       assembleColumns: [

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

@@ -374,6 +374,9 @@ export default {
         rows: JSON.stringify(detailArr),
       }
     },
+    getUnitInfo(val) {
+      this.unitList = val
+    },
   },
 }
 </script>

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

@@ -453,23 +453,23 @@ export default {
           { title: '单价', key: 'unitPrice', width: '5%', type: FormTypes.inputNumber },
           { title: '金额', key: 'allPrice', width: '5%', type: FormTypes.inputNumber, statistics: true },
 
-          {
-            title: '实际入库数量',
-            key: 'actualQuantityInStorage',
-            width: '9%',
-            type: FormTypes.inputNumber,
-            validateRules: [{ required: true, message: '实际入库数量不能为空' }],
-          },
-          { title: '入库差异', key: 'warehousingVariance', width: '9%', type: FormTypes.input },
-          { title: '入库差异原因', key: 'reasonOfDifference', width: '9%', type: FormTypes.input },
-          {
-            title: '入库人',
-            key: 'warehousingUser',
-            width: '9%',
-            type: FormTypes.input,
-            validateRules: [{ required: true, message: '入库人不能为空' }],
-          },
-          { title: '入库时间', key: 'warehousingTime', width: '9%', type: FormTypes.date },
+          // {
+          //   title: '实际入库数量',
+          //   key: 'actualQuantityInStorage',
+          //   width: '9%',
+          //   type: FormTypes.inputNumber,
+          //   validateRules: [{ required: true, message: '实际入库数量不能为空' }],
+          // },
+          // { title: '入库差异', key: 'warehousingVariance', width: '9%', type: FormTypes.input },
+          // { title: '入库差异原因', key: 'reasonOfDifference', width: '9%', type: FormTypes.input },
+          // {
+          //   title: '入库人',
+          //   key: 'warehousingUser',
+          //   width: '9%',
+          //   type: FormTypes.input,
+          //   validateRules: [{ required: true, message: '入库人不能为空' }],
+          // },
+          // { title: '入库时间', key: 'warehousingTime', width: '9%', type: FormTypes.date },
 
           { title: '税率', key: 'taxRate', width: '4%', type: FormTypes.inputNumber, placeholder: '%' },
           {

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

@@ -435,23 +435,23 @@ export default {
           },
           { title: '价税合计', key: 'taxLastMoney', width: '7%', type: FormTypes.inputNumber, statistics: true },
 
-          {
-            title: '实际出库数量',
-            key: 'actualQuantityInStorage',
-            width: '9%',
-            type: FormTypes.inputNumber,
-            validateRules: [{ required: true, message: '实际入库数量不能为空' }],
-          },
-          { title: '出库差异', key: 'warehousingVariance', width: '9%', type: FormTypes.input },
-          { title: '出库差异原因', key: 'reasonOfDifference', width: '9%', type: FormTypes.input },
-          {
-            title: '出库人',
-            key: 'warehousingUser',
-            width: '9%',
-            type: FormTypes.input,
-            validateRules: [{ required: true, message: '出库人不能为空' }],
-          },
-          { title: '出库时间', key: 'warehousingTime', width: '9%', type: FormTypes.date },
+          // {
+          //   title: '实际出库数量',
+          //   key: 'actualQuantityInStorage',
+          //   width: '9%',
+          //   type: FormTypes.inputNumber,
+          //   validateRules: [{ required: true, message: '实际入库数量不能为空' }],
+          // },
+          // { title: '出库差异', key: 'warehousingVariance', width: '9%', type: FormTypes.input },
+          // { title: '出库差异原因', key: 'reasonOfDifference', width: '9%', type: FormTypes.input },
+          // {
+          //   title: '出库人',
+          //   key: 'warehousingUser',
+          //   width: '9%',
+          //   type: FormTypes.input,
+          //   validateRules: [{ required: true, message: '出库人不能为空' }],
+          // },
+          // { title: '出库时间', key: 'warehousingTime', width: '9%', type: FormTypes.date },
 
           { title: '备注', key: 'remark', width: '6%', type: FormTypes.input },
           { title: '关联id', key: 'linkId', width: '5%', type: FormTypes.hidden },

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

@@ -0,0 +1,61 @@
+<template>
+  <a-row :gutter="24">
+    <a-col :md="24">
+      <a-card :bordered="false">
+        <!-- 查询区域 -->
+        <filter-form></filter-form>
+        <div>
+          <a-button type="primary" icon="plus">新增盘点任务</a-button>
+          <a-button>取消盘点</a-button>
+          <a-button>批量删除</a-button>
+          <a-button>导出任务</a-button>
+        </div>
+        <a-table
+          ref="table"
+          size="middle"
+          bordered
+          rowKey="id"
+          :columns="taskColumns"
+          :dataSource="dataSource"
+          :components="handleDrag(taskColumns)"
+          :pagination="ipagination"
+          :scroll="scroll"
+          :loading="loading"
+          :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+          @change="handleTableChange"
+        >
+          <span slot="action" slot-scope="text, record">
+            <a @click="myHandleDetail(record, '采购入库', prefixNo)">查看</a>
+            <a-divider v-if="btnEnableList.indexOf(1) > -1" type="vertical" />
+            <a v-if="btnEnableList.indexOf(1) > -1" @click="myHandleEdit(record)">编辑</a>
+            <a-divider v-if="btnEnableList.indexOf(1) > -1" type="vertical" />
+            <a-popconfirm
+              v-if="btnEnableList.indexOf(1) > -1"
+              title="确定删除吗?"
+              @confirm="() => myHandleDelete(record)"
+            >
+              <a>删除</a>
+            </a-popconfirm>
+          </span>
+        </a-table>
+      </a-card>
+    </a-col>
+  </a-row>
+</template>
+
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import FilterForm from './components/FilterForm.vue'
+
+export default {
+  components: { FilterForm },
+  mixins: [JeecgListMixin],
+  data() {
+    return {
+      taskColumns: [],
+    }
+  },
+}
+</script>
+
+<style></style>

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

@@ -0,0 +1,70 @@
+<template>
+  <div class="table-page-search-wrapper">
+    <!-- 搜索区域 -->
+    <a-form layout="inline" @keyup.enter.native="searchQuery">
+      <a-row :gutter="24">
+        <a-col :md="6" :sm="24">
+          <a-form-item label="盘点状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-select placeholder="请选择供应商" showSearch optionFilterProp="children" v-model="queryParam.organId">
+              <a-select-option v-for="(item, index) in statusList" :key="index" :value="item.id">
+                {{ item.supplier }}
+              </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.materialParam"
+            ></a-input>
+          </a-form-item>
+        </a-col>
+        <a-col :md="6" :sm="24">
+          <a-form-item label="盘点仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-select placeholder="请选择盘点仓库" showSearch optionFilterProp="children" v-model="queryParam.organId">
+              <a-select-option v-for="(item, index) in statusList" :key="index" :value="item.id">
+                {{ item.supplier }}
+              </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 placeholder="请选择创建人" showSearch optionFilterProp="children" v-model="queryParam.organId">
+              <a-select-option v-for="(item, index) in statusList" :key="index" :value="item.id">
+                {{ item.supplier }}
+              </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 placeholder="请选择商品类别" showSearch optionFilterProp="children" v-model="queryParam.organId">
+              <a-select-option v-for="(item, index) in statusList" :key="index" :value="item.id">
+                {{ item.supplier }}
+              </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.number"></a-input>
+          </a-form-item>
+        </a-col>
+        <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
+          <a-col :md="6" :sm="24">
+            <a-button type="primary" @click="searchQuery">查询</a-button>
+            <a-button style="margin-left: 8px" @click="searchReset">重置</a-button>
+          </a-col>
+        </span>
+      </a-row>
+    </a-form>
+  </div>
+</template>
+
+<script>
+export default {}
+</script>
+
+<style></style>