Merge remote-tracking branch 'origin/xq' into master_liushuang

# Conflicts:
#	jshERP-web/src/views/system/modules/userSupplierModal.vue

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

@@ -53,9 +53,9 @@
               @change="handleChangeCheckedAll"
             />
           </div>
-          <!-- 右侧动态生成td -->
-          <template v-for="col in columns">
-            <div v-show="col.type !== formTypes.hidden" class="td" :key="col.key" :style="buildTdStyle(col)">
+          <!-- 右侧动态生成td 这里是title -->
+          <template v-for="col in columns" v-if="col.type !== formTypes.hidden">
+            <div class="td" :key="col.key" :style="buildTdStyle(col)">
               <span style="padding: 0 5px">
                 {{ col.title }}
                 <slot name="depotBatchSet" v-if="col.key === 'depotId'" :target="getVM()" />
@@ -156,7 +156,7 @@
                   </template>
                 </div>
 
-                <!-- 右侧动态生成td -->
+                <!-- 右侧动态生成td 这里是内容区 -->
                 <div
                   class="td"
                   v-for="col in columns"
@@ -481,7 +481,7 @@
 
                     <!-- update-begin-author:jsh date:20210308 for：popupJsh -->
                     <template v-else-if="col.type === formTypes.popupJsh">
-                      <div style="max-width: 200px" :key="i">
+                      <div style="width: 190px" :key="i">
                         <a-tooltip
                           :id="id"
                           placement="top"
@@ -2827,6 +2827,8 @@ export default {
         style['padding-left'] = '0'
         style['padding-right'] = '0'
       }
+      style['box-sizing'] = 'border-box'
+
       return style
     },
     /** view辅助方法：构造props */
@@ -3304,9 +3306,10 @@ export default {
         transition: all 0.3s;
         outline: none;
         overflow: hidden;
-        white-space: nowrap;
+        // white-space: nowrap;
         text-overflow: ellipsis;
-        max-width: 150px;
+        // flex-shrink: 0;
+        // max-width: 150px;
       }
     }
   }

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

@@ -95,7 +95,7 @@
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="仓库货架" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input placeholder="请输入制造商" v-model="queryParam.position"></a-input>
+                    <a-input placeholder="请输入仓库货架" v-model="queryParam.position"></a-input>
                   </a-form-item>
                 </a-col>
                 <!-- <a-col :md="6" :sm="24">
@@ -109,7 +109,7 @@
               </template>
             </a-row>
           </a-form>
-          <a-button type="primary" @click="findAllSelect">一键全选</a-button>
+          <a-button v-if="isStock" type="primary" @click="findAllSelect">一键全选</a-button>
           <a-table
             ref="table"
             :scroll="scrollTrigger"
@@ -169,7 +169,7 @@ export default {
   components: {
     MaterialModal: () => import('@/views/material/modules/MaterialModal'),
   },
-  props: ['rows', 'multi', 'barCode'],
+  props: ['rows', 'multi', 'barCode', 'isStock'],
   data() {
     return {
       modalWidth: 1450,
@@ -430,7 +430,8 @@ export default {
     initDepotSelect() {
       if (this.rows) {
         if (JSON.parse(this.rows).depotId) {
-          this.queryParam.depotId = JSON.parse(this.rows).depotId - 0
+          const id = JSON.parse(this.rows).depotId - 0
+          this.queryParam.depotId = id + ''
         }
       }
     },

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

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

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

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

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

@@ -701,11 +701,11 @@ export const BillModalMixin = {
             if (!Array.isArray(arr)) {
               arr = JSON.parse(arr)
             }
-            for (let i of arr) {
-              if (i.name === value) {
-                target.setValues([{ rowKey: row.id, values: { unitName: i.name } }])
-              }
-            }
+            // for (let i of arr) {
+            //   if (i.name === value) {
+            //     target.setValues([{ rowKey: row.id, values: { unitName: i.name } }])
+            //   }
+            // }
           }
 
           target.$forceUpdate()

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

@@ -115,7 +115,6 @@
               :value="value"
               :options="currentUserList"
               @change="($event) => handleChange($event)"
-              @focus="($event) => handleFocus($event)"
             >
             </a-select>
           </template>
@@ -219,19 +218,19 @@ export default {
             multi: true,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '名称', key: 'name', width: '10%', type: FormTypes.normal },
+          { title: '名称', key: 'name', width: '9%', type: FormTypes.normal },
           { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
 
-          { title: '生产日期', key: 'productionDate', width: '9%', type: FormTypes.normal },
+          { title: '生产日期', key: 'productionDate', width: '9%', type: FormTypes.normal, disabled: true },
           { title: '保质期', key: 'expiryNum', width: '6%', type: FormTypes.normal },
-          { title: '商品条码', key: 'barCode', width: '6%', type: FormTypes.normal },
-          { title: '仓库名', key: 'depotName', width: '6%', type: FormTypes.normal },
+          { title: '商品条码', key: 'barCode', width: '9%', type: FormTypes.normal },
+          { title: '仓库名', key: 'depotId', width: '9%', type: FormTypes.select, disabled: true },
           { title: '仓库货架', key: 'position', width: '6%', type: FormTypes.normal },
-          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.normal },
+          { title: '包装规格', key: 'unitName', width: '7%', type: FormTypes.normal },
 
           { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
-          { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
-          { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+          { title: '颜色', key: 'color', width: '9%', type: FormTypes.normal },
+          { title: '品牌', key: 'brand', width: '9%', type: FormTypes.normal },
           { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
           { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
           { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },

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

@@ -160,7 +160,6 @@
               :value="value"
               :options="currentUserList"
               @change="($event) => handleChange($event)"
-              @focus="($event) => handleFocus($event)"
             >
             </a-select>
           </template>
@@ -292,26 +291,26 @@ export default {
             multi: true,
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '名称', key: 'name', width: '10%', type: FormTypes.normal },
+          { title: '名称', key: 'name', width: '9%', type: FormTypes.normal },
           { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
 
           { title: '生产日期', key: 'productionDate', width: '9%', type: FormTypes.normal },
           { title: '保质期', key: 'expiryNum', width: '6%', type: FormTypes.normal },
           { title: '商品条码', key: 'barCode', width: '9%', type: FormTypes.normal },
           { title: '仓库名', key: 'depotId', width: '9%', type: FormTypes.normal },
-          { title: '仓库货架', key: 'position', width: '9%', type: FormTypes.normal },
-          { title: '包装规格', key: 'unitName', width: '9%', type: FormTypes.normal },
+          { title: '仓库货架', key: 'position', width: '6%', type: FormTypes.normal },
+          { title: '包装规格', key: 'unitName', width: '7%', type: FormTypes.normal },
 
           { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
-          { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
-          { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+          { title: '颜色', key: 'color', width: '9%', type: FormTypes.normal },
+          { title: '品牌', key: 'brand', width: '9%', type: FormTypes.normal },
           { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
           { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
           { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },
           {
             title: '单位',
             key: 'unit',
-            width: '4%',
+            width: '6%',
             type: FormTypes.slot,
             options: [],
             allowClear: false,
@@ -325,7 +324,7 @@ export default {
           { title: '原数量', key: 'preNumber', width: '4%', type: FormTypes.normal },
           { title: '已入库', key: 'finishNumber', width: '4%', type: FormTypes.normal },
           {
-            title: '数量',
+            title: '入库数量',
             key: 'operNumber',
             width: '5%',
             type: FormTypes.inputNumber,

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

@@ -161,7 +161,6 @@
               :value="value"
               :options="currentUserList"
               @change="($event) => handleChange($event)"
-              @focus="($event) => handleFocus($event)"
             >
             </a-select>
           </template>
@@ -289,21 +288,23 @@ export default {
             type: FormTypes.popupJsh,
             kind: 'material',
             multi: true,
+            newBatch: true,
+
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '名称', key: 'name', width: '10%', type: FormTypes.normal },
+          { title: '名称', key: 'name', width: '9%', type: FormTypes.normal },
           { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
 
-          { title: '生产日期', key: 'productionDate', width: '9%', type: FormTypes.normal },
+          { title: '生产日期', key: 'productionDate', width: '9%', type: FormTypes.normal, disabled: true },
           { title: '保质期', key: 'expiryNum', width: '6%', type: FormTypes.normal },
-          { title: '商品条码', key: 'barCode', width: '6%', type: FormTypes.normal },
-          { title: '仓库名', key: 'depotId', width: '6%', type: FormTypes.select, disabled: true },
+          { title: '商品条码', key: 'barCode', width: '9%', type: FormTypes.normal },
+          { title: '仓库名', key: 'depotId', width: '9%', type: FormTypes.select, disabled: true },
           { title: '仓库货架', key: 'position', width: '6%', type: FormTypes.normal },
-          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.normal },
+          { title: '包装规格', key: 'unitName', width: '7%', type: FormTypes.normal },
 
           { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
-          { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
-          { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+          { title: '颜色', key: 'color', width: '9%', type: FormTypes.normal },
+          { title: '品牌', key: 'brand', width: '9%', type: FormTypes.normal },
           { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
           { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
           { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },

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

@@ -185,7 +185,6 @@
               :value="value"
               :options="currentUserList"
               @change="($event) => handleChange($event)"
-              @focus="($event) => handleFocus($event)"
             >
             </a-select>
           </template>
@@ -472,19 +471,19 @@ export default {
 
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '名称', key: 'name', width: '7%', type: FormTypes.normal },
-          { title: '规格', key: 'standard', width: '6%', type: FormTypes.normal },
+          { title: '名称', key: 'name', width: '9%', type: FormTypes.normal },
+          { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
 
           { title: '生产日期', key: 'productionDate', width: '9%', type: FormTypes.normal, disabled: true },
           { title: '保质期', key: 'expiryNum', width: '6%', type: FormTypes.normal },
-          { title: '商品条码', key: 'barCode', width: '6%', type: FormTypes.normal },
-          { title: '仓库名', key: 'depotId', width: '6%', type: FormTypes.select, disabled: true },
+          { title: '商品条码', key: 'barCode', width: '9%', type: FormTypes.normal },
+          { title: '仓库名', key: 'depotId', width: '9%', type: FormTypes.select, disabled: true },
           { title: '仓库货架', key: 'position', width: '6%', type: FormTypes.normal },
-          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.normal },
+          { title: '包装规格', key: 'unitName', width: '7%', type: FormTypes.normal },
 
           { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
-          { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
-          { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+          { title: '颜色', key: 'color', width: '9%', type: FormTypes.normal },
+          { title: '品牌', key: 'brand', width: '9%', type: FormTypes.normal },
           { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
           { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
           { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },

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

@@ -187,7 +187,6 @@
               :value="value"
               :options="currentUserList"
               @change="($event) => handleChange($event)"
-              @focus="($event) => handleFocus($event)"
             >
             </a-select>
           </template>
@@ -493,21 +492,23 @@ export default {
             type: FormTypes.popupJsh,
             kind: 'material',
             multi: true,
+            newBatch: true,
+
             validateRules: [{ required: true, message: '${title}不能为空' }],
           },
-          { title: '名称', key: 'name', width: '10%', type: FormTypes.normal },
+          { title: '名称', key: 'name', width: '9%', type: FormTypes.normal },
           { title: '规格', key: 'standard', width: '9%', type: FormTypes.normal },
 
-          { title: '生产日期', key: 'productionDate', width: '9%', type: FormTypes.normal },
+          { title: '生产日期', key: 'productionDate', width: '9%', type: FormTypes.normal, disabled: true },
           { title: '保质期', key: 'expiryNum', width: '6%', type: FormTypes.normal },
-          { title: '商品条码', key: 'barCode', width: '6%', type: FormTypes.normal },
-          { title: '仓库名', key: 'depotId', width: '6%', type: FormTypes.select, disabled: true },
+          { title: '商品条码', key: 'barCode', width: '9%', type: FormTypes.normal },
+          { title: '仓库名', key: 'depotId', width: '9%', type: FormTypes.select, disabled: true },
           { title: '仓库货架', key: 'position', width: '6%', type: FormTypes.normal },
-          { title: '包装规格', key: 'unitName', width: '6%', type: FormTypes.normal },
+          { title: '包装规格', key: 'unitName', width: '7%', type: FormTypes.normal },
 
           { title: '型号', key: 'model', width: '9%', type: FormTypes.normal },
-          { title: '颜色', key: 'color', width: '5%', type: FormTypes.normal },
-          { title: '品牌', key: 'brand', width: '6%', type: FormTypes.normal },
+          { title: '颜色', key: 'color', width: '9%', type: FormTypes.normal },
+          { title: '品牌', key: 'brand', width: '9%', type: FormTypes.normal },
           { title: '制造商', key: 'mfrs', width: '6%', type: FormTypes.normal },
           { title: '扩展信息', key: 'materialOther', width: '5%', type: FormTypes.normal },
           { title: '库存', key: 'stock', width: '5%', type: FormTypes.normal },

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

@@ -85,11 +85,9 @@
             <span slot="action" v-if="openType !== 'detail'" slot-scope="text, record">
               <a type="text" @click="handleEdit(record)">编辑</a>
             </span>
-            <!-- <template slot="customName" slot-scope="text, record">
-          {{ record.name }}
-          <a-tag v-if="record.enableSerialNumber == 1" color="orange">序</a-tag>
-          <a-tag v-if="record.enableBatchNumber == 1" color="orange">批</a-tag>
-        </template> -->
+            <template slot="inventory" slot-scope="value, record">
+              {{ parseInt(value) }}
+            </template>
           </a-table>
         </div>
       </a-spin>
@@ -104,6 +102,7 @@
       @all="findAllSelect"
       ref="selectModal"
       :multi="true"
+      :isStock="true"
     ></j-select-material-modal>
     <a-modal @cancel="editVisible = false" @ok="onSubmitGoods" :visible="editVisible" title="编辑" width="50%">
       <a-form :form="editForm">

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

@@ -38,6 +38,9 @@
                 <a>删除</a>
               </a-popconfirm>
             </span>
+            <template slot="inventory" slot-scope="value, record">
+              {{ parseInt(value) }}
+            </template>
             <!-- <template slot="customName" slot-scope="text, record">
           {{ record.name }}
           <a-tag v-if="record.enableSerialNumber == 1" color="orange">序</a-tag>
@@ -56,6 +59,7 @@
       @all="findAllSelect"
       ref="selectModal"
       :multi="true"
+      :isStock="true"
     ></j-select-material-modal>
   </div>
 </template>

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

@@ -65,20 +65,20 @@ const table = {
 
     // { dataIndex: 'mBarCode', title: '条码', scopedSlots: { customRender: 'customBarCode' } },
     { dataIndex: 'batchNumber', title: '批次号' },
-    { dataIndex: 'name', title: '名称', scopedSlots: { customRender: 'customName' } },
+    { dataIndex: 'materialName', title: '商品名称', scopedSlots: { customRender: 'customName' } },
     { dataIndex: 'categoryName', title: '类别' },
     { dataIndex: 'standard', title: '规格' },
     { dataIndex: 'model', title: '型号' },
     { dataIndex: 'color', title: '颜色' },
     { dataIndex: 'brand', title: '品牌' },
     { dataIndex: 'supplierName', title: '供应商' },
-    { dataIndex: 'unit', title: '单位' },
+    { dataIndex: 'commodityUnit', title: '单位' },
     { dataIndex: 'sku', title: '多属性' },
-    { dataIndex: 'stock', title: '库存' },
+    { dataIndex: 'inventory', title: '库存', scopedSlots: { customRender: 'inventory' } },
     { dataIndex: 'productionDate', title: '生产日期' },
     { dataIndex: 'expiryNum', title: '保质期' },
     { dataIndex: 'barCode', title: '商品条码' },
-    { dataIndex: 'depotId', title: '仓库名称' },
+    { dataIndex: 'depotName', title: '仓库名称' },
     { dataIndex: 'position', title: '仓库货架' },
   ],
   checkGoodsColumns: [
@@ -90,8 +90,8 @@ const table = {
     { dataIndex: 'productionDate', title: '生产日期' },
     { dataIndex: 'supplierName', title: '供应商' },
     { dataIndex: 'barCode', title: '商品条码' },
-    { dataIndex: 'stock', title: '库存(最小单位)' },
-    { dataIndex: 'depotId', title: '仓库名称' },
+    { dataIndex: 'inventory', title: '库存(最小单位)', scopedSlots: { customRender: 'inventory' } },
+    { dataIndex: 'depotName', title: '仓库名称' },
     { dataIndex: 'position', title: '仓库货架' },
     { dataIndex: 'newInventory', title: '实际库存' },
     { dataIndex: 'newPosition', title: '实际仓位货架' },

jshERP-web/src/views/system/VendorList.vue

@@ -162,7 +162,7 @@ export default {
         },
         { title: '账单周期', dataIndex: 'billingCycleDays', width: 80, align: 'left' },
         { title: '采购对接人', dataIndex: 'procurementContact', width: 100, align: 'left' },
-        { title: '到货天数', dataIndex: 'deliverydays', width: 80, align: 'left' },
+        { title: '到货天数', dataIndex: 'deliveryDays', width: 80, align: 'left' },
         {
           title: '发票类型',
           dataIndex: 'invoiceType',

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

@@ -116,7 +116,7 @@
             </a-col>
             <a-col :span="24 / 2">
               <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="到货天数">
-                <a-input placeholder="请输入到货天数" v-decorator.trim="['deliverydays']" />
+                <a-input placeholder="请输入到货天数" v-decorator.trim="['deliveryDays']" />
               </a-form-item>
             </a-col>
             <a-col :span="24 / 2">
@@ -248,7 +248,7 @@ export default {
             'settlementMethod',
             'billingCycleDays',
             'procurementContact',
-            'deliverydays',
+            'deliveryDays',
             'invoiceType',
             'contractUpload'
           )

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

@@ -109,6 +109,7 @@ export default {
           formData.type = 'UserSupplier'
           formData.keyId = this.roleId
           formData.value = this.checkedKeys.map((item) => Number(item))
+
           let obj
           checkUserBusiness({ type: 'UserSupplier', keyId: this.roleId }).then((res) => {
             if (res.data && res.data.id) {