guarantee-lsq 1 year ago
parent
commit
dfd9626095

+ 1 - 1
src/api/store/sparestore.js

@@ -68,7 +68,7 @@ export function addSpareStore (parameter) {
  */
 export function addSpare (parameter) {
   return axios({
-    url: '/yongyou/add/spare/' + parameter.tokenType,
+    url: '/yongyou/add/spare/tokenType',
     method: 'POST',
     headers: {
       'Accept': 'application/json',

+ 3 - 3
src/views/purchase/purchase-order-page/PurchaseOrderPage.vue

@@ -21,7 +21,7 @@
 
       <div class="table-operator" style="margin-bottom: 8px;">
         <a-button v-if="$auth('purchase-purchase-orders-add')" type="primary" icon="plus" @click="$refs.baseForm.base()">采购计划</a-button>
-        <!--        <a-button v-if="$auth('purchase-purchase-orders-add')" style="margin-left: 8px" type="primary" icon="plus" @click="$refs.addSpareForm.base()">新增物料</a-button>-->
+        <a-button v-if="$auth('purchase-purchase-orders-add')" style="margin-left: 8px" type="primary" icon="plus" @click="$refs.addSpareForm.base()">新增物料</a-button>
         <!-- <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('purchase-purchase-orders-del')">
           <a-menu slot="overlay">
             <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
@@ -128,7 +128,7 @@ export default {
           title: '采购类型',
           dataIndex: 'cptcode',
           checked: true,
-          width: 100,
+          width: 130,
           customRender: (text, record, index) => {
             return this.BaseTool.Table.getMapText(this.cptcodeMap, text)
           }
@@ -137,7 +137,7 @@ export default {
           title: '业务类型',
           dataIndex: 'cbustype',
           checked: true,
-          width: 100,
+          width: 150,
           customRender: (text, record, index) => {
             return this.BaseTool.Table.getMapText(this.cbustypeMap, text)
           }

+ 5 - 5
src/views/store/sparestore/modules/AddSpareForm.vue

@@ -31,7 +31,7 @@
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              v-decorator="['cInvName', {rules: [{required: true, message: '存货名称不能为空'}]}]" />
+              v-decorator="['cestInvName', {rules: [{required: true, message: '存货名称不能为空'}]}]" />
           </a-form-item>
         </row-item>
         <row-item>
@@ -41,7 +41,7 @@
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
-              v-decorator="['cInvStd', {rules: [{required: true, message: '规格型号不能为空'}]}]" />
+              v-decorator="['cestInvStd', {rules: [{required: true, message: '规格型号不能为空'}]}]" />
           </a-form-item>
         </row-item>
         <row-item>
@@ -56,7 +56,7 @@
               :treeData="treeData"
               :treeNodeFilterProp="'title'"
               :showSearch="true"
-              v-decorator="['cInvCCode', {rules: [{required: true, message: '存货分类编码不能为空'}]}]"
+              v-decorator="['cestInvCode', {rules: [{required: true, message: '存货分类编码不能为空'}]}]"
               placeholder="请选择"
             >
             </a-tree-select>
@@ -68,12 +68,12 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['cComUnitCode', {rules: [{required: true, message: '计量单位不能为空'}]}]">
+            <a-select v-decorator="['cestComUnitCode', {rules: [{required: true, message: '计量单位不能为空'}]}]">
               <a-select-option
                 v-for="(label,value) in unitMap"
                 :key="value"
                 :label="label"
-                :value="parseInt(value)">{{ label }}
+                :value="value">{{ label }}
               </a-select-option>
             </a-select>
           </a-form-item>