完善

src/utils/dict.js

@@ -340,7 +340,8 @@ DictCache.TYPE = {
   YONG_YOU_DEPT: 'YONG_YOU_DEPT', // 部门
   LONG_YAN_PURCHASE_BUSINESS_TYPE: 'LONG_YAN_PURCHASE_BUSINESS_TYPE', // 业务类型
   LONG_YAN_PURCHASE_ORDER_STATUS: 'LONG_YAN_PURCHASE_ORDER_STATUS', // 采购单状态
-  GROUP_TYPE: 'GROUP_TYPE' // 计量单位组类别
+  GROUP_TYPE: 'GROUP_TYPE', // 计量单位组类别
+  SPARE_ADD_UNIT: 'SPARE_ADD_UNIT'// 计量单位
 }
 DictCache.CODE = {
 

src/views/purchase/purchase-order-page/modules/BaseForm.vue

@@ -312,7 +312,9 @@ export default {
           'projectId',
           'positionNo',
           'cptcode',
-          'remark'
+          'remark',
+          'cdepcode',
+          'cbustype'
         ])))
       })
     },

src/views/store/sparestore/modules/AddSpareForm.vue

@@ -26,27 +26,7 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="存货编码"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['cInvCode', {rules: [{required: true, message: '存货编码不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="存货代码"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['cInvAddCode', {rules: [{required: true, message: '存货代码不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="存货名称"
+            label="物料名称"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -54,7 +34,6 @@
               v-decorator="['cInvName', {rules: [{required: true, message: '存货名称不能为空'}]}]" />
           </a-form-item>
         </row-item>
-
         <row-item>
           <a-form-item
             label="规格型号"
@@ -67,122 +46,31 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="存货分类编码"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['cInvCCode', {rules: [{required: true, message: '存货分类编码不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="计量单位组编码"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['cGroupCode', {rules: [{required: true, message: '计量单位组编码不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="主计量单位编码"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['cComUnitCode', {rules: [{required: true, message: '主计量单位编码不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="零售计量单位"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['cShopUnit', {rules: [{required: true, message: '零售计量单位不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="生产部门"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['cInvDepCode', {rules: [{required: true, message: '生产部门不能为空'}]}]" >
-              <a-select-option
-                v-for="(label,value) in deptMap"
-                :key="value"
-                :label="label"
-                :value="parseInt(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="计价方式"
+            label="存货分类"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-input
-              v-decorator="['cValueType', {rules: [{required: true, message: '计价方式不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="启用日期"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-date-picker
+            <a-tree-select
               style="width: 100%"
-              show-time
-              :format="BaseTool.Date.PICKER_NORM_DATETIME_PATTERN"
-              v-decorator="['dSDate', {rules: [{required: true, message: '启用日期不能为空'}]}]" />
+              :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+              :treeData="treeData"
+              :treeNodeFilterProp="'title'"
+              :showSearch="true"
+              v-decorator="['cInvCCode', {rules: [{required: true, message: '存货分类编码不能为空'}]}]"
+              placeholder="请选择"
+            >
+            </a-tree-select>
           </a-form-item>
         </row-item>
         <row-item>
           <a-form-item
-            label="供需政策"
+            label="计量单位"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-input
-              v-decorator="['cSRPolicy', {rules: [{required: true, message: '供需政策不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="计划方法"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['cPanMethod', {rules: [{required: true, message: '计划方法不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="存货自定义项1"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['cInvDefine1', {rules: [{required: true, message: '存货自定义项1不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="是否销售"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['bSale', {rules: [{required: true, message: '是否销售不能为空'}]}]">
+            <a-select v-decorator="['cComUnitCode', {rules: [{required: true, message: '计量单位不能为空'}]}]">
               <a-select-option
-                v-for="(label,value) in yesOrNo"
+                v-for="(label,value) in unitMap"
                 :key="value"
                 :label="label"
                 :value="parseInt(value)">{{ label }}
@@ -192,282 +80,12 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="是否自制"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['bSelf', {rules: [{required: true, message: '是否自制不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in yesOrNo"
-                :key="value"
-                :label="label"
-                :value="Boolean(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="是否生产耗用"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['bComsume', {rules: [{required: true, message: '是否生产耗用不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in yesOrNo"
-                :key="value"
-                :label="label"
-                :value="Boolean(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="计量单位组类别"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['iGroupType', {rules: [{required: true, message: '计量单位组类别用不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in groupTypeMap"
-                :key="value"
-                :label="label"
-                :value="parseInt(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="是否外购"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['bPurchase', {rules: [{required: true, message: '是否外购不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in yesOrNo"
-                :key="value"
-                :label="label"
-                :value="Boolean(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="采购默认计量单位编码"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['cPUComUnitCode', {rules: [{required: true, message: '采购默认计量单位编码不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="销售默认计量单位编码"
+            label="备注"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              v-decorator="['cSAComUnitCode', {rules: [{required: true, message: '销售默认计量单位编码不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="库存默认计量单位编码"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['cSTComUnitCode', {rules: [{required: true, message: '库存默认计量单位编码不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="成本默认计量单位编码，"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-input
-              v-decorator="['cCAComUnitCode', {rules: [{required: true, message: '成本默认计量单位编码不能为空'}]}]" />
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="领料方式"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['iDrawType', {rules: [{required: true, message: '领料方式不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in drawTypeMap"
-                :key="value"
-                :label="label"
-                :value="parseInt(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="供应类型"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['iSupplyType', {rules: [{required: true, message: '供应类型不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in supplyTypeMap"
-                :key="value"
-                :label="label"
-                :value="parseInt(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="是否批次管理"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['bInvBatch', {rules: [{required: true, message: '是否批次管理不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in yesOrNo"
-                :key="value"
-                :label="label"
-                :value="Boolean(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="需求跟踪方式"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['iRequireTrackStyle', {rules: [{required: true, message: '需求跟踪方式不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in yesOrNo"
-                :key="value"
-                :label="label"
-                :value="Boolean(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="允许BOM母件"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['bBomMain', {rules: [{required: true, message: '允许BOM母件不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in yesOrNo"
-                :key="value"
-                :label="label"
-                :value="Boolean(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="允许BOM子件"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['bBomSub', {rules: [{required: true, message: '允许BOM子件不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in yesOrNo"
-                :key="value"
-                :label="label"
-                :value="Boolean(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="允许生产订单"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['bProductBill', {rules: [{required: true, message: '允许生产订单不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in yesOrNo"
-                :key="value"
-                :label="label"
-                :value="Boolean(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="计划默认属性"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['iPlanDefault', {rules: [{required: true, message: '计划默认属性不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in planDefaultMap"
-                :key="value"
-                :label="label"
-                :value="parseInt(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="存货是否有自由项1"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['bFree1', {rules: [{required: true, message: '存货是否有自由项1不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in yesOrNo"
-                :key="value"
-                :label="label"
-                :value="Boolean(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="存货是否有自由项2"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['bFree2', {rules: [{required: true, message: '存货是否有自由项2不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in yesOrNo"
-                :key="value"
-                :label="label"
-                :value="Boolean(value)">{{ label }}
-              </a-select-option>
-            </a-select>
-          </a-form-item>
-        </row-item>
-        <row-item>
-          <a-form-item
-            label="存货是否有自由项3"
-            :labelCol="BaseTool.Constant.labelCol"
-            :wrapperCol="BaseTool.Constant.wrapperCol"
-          >
-            <a-select v-decorator="['bFree3', {rules: [{required: true, message: '存货是否有自由项3不能为空'}]}]">
-              <a-select-option
-                v-for="(label,value) in yesOrNo"
-                :key="value"
-                :label="label"
-                :value="Boolean(value)">{{ label }}
-              </a-select-option>
-            </a-select>
+              v-decorator="['remark']" />
           </a-form-item>
         </row-item>
       </row-list>
@@ -482,6 +100,7 @@
 <script>
 import pick from 'lodash.pick'
 import { addSpare } from '@/api/store/sparestore'
+import { getInventoryTree } from '@/api/purchase/inventory'
 
 export default {
   data () {
@@ -490,24 +109,19 @@ export default {
       visible: false,
       confirmLoading: false,
       form: this.$form.createForm(this),
-      yesOrNo: {},
-      planDefaultMap: {},
-      drawTypeMap: {},
-      supplyTypeMap: {},
-      groupTypeMap: {},
+      treeData: [],
       flagMap: {},
       deptMap: {}
 
     }
   },
   created () {
-    this.yesOrNo = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
-    this.planDefaultMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.PLAN_DEFAULT)
-    this.drawTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.DRAW_TYPE)
-    this.supplyTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SUPPLY_TYPE)
-    this.groupTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.GROUP_TYPE)
     this.flagMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.PROJECT_NEW_AND_OLD)
-    this.deptMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YONG_YOU_DEPT)
+    this.unitMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SPARE_ADD_UNIT)
+    getInventoryTree().then(res => {
+      // 循环获取样式
+      this.treeData = res.data
+    })
   },
   methods: {
     base (record) {
@@ -535,7 +149,6 @@ export default {
           return
         }
         // 日期处理
-        values.dSDate = this.BaseTool.Date.formatter(values.dSDate, this.BaseTool.Date.PICKER_NORM_DATETIME_PATTERN)
         if (this.BaseTool.String.isBlank(values.id)) {
           addSpare(values)
             .then(() => {