chenrui 4 år sedan
förälder
incheckning
97dfdfede0

+ 8 - 8
src/config/router.config.js

@@ -55,7 +55,7 @@ export const asyncRouterMap = [
         component: PageView,
         meta: {
           title: '销售管理',
-          icon: 'account-book',
+          icon: 'account-book'
           // permission: 'M_salesManage'
         },
         children: [
@@ -66,7 +66,7 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '销售单查询',
-              icon: 'monitor',
+              icon: 'monitor'
               // permission: 'M_salesQueryList'
             },
             hideChildrenInMenu: true,
@@ -77,12 +77,12 @@ export const asyncRouterMap = [
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/list.vue'),
                 meta: {
                   title: '销售单列表',
-                  icon: 'monitor',
+                  icon: 'monitor'
                   // permission: 'M_salesQueryList'
                 }
               },
               {
-                path: 'detail/:id/:sn',
+                path: 'detail/:sn',
                 name: 'salesDetail',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/salesQuery/detail.vue'),
                 meta: {
@@ -655,7 +655,7 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '店内调出',
-              icon: 'interaction',
+              icon: 'interaction'
               // permission: 'M_storeTransferOutList'
             },
             hideChildrenInMenu: true,
@@ -1267,7 +1267,7 @@ export const asyncRouterMap = [
         component: PageView,
         meta: {
           title: '财务管理',
-          icon: 'property-safety',
+          icon: 'property-safety'
           // permission: 'M_financial'
         },
         children: [
@@ -1400,7 +1400,7 @@ export const asyncRouterMap = [
             component: RouteView,
             meta: {
               title: '费用管理',
-              icon: 'pound',
+              icon: 'pound'
               // permission: 'M_expenseManagementList'
             },
             hideChildrenInMenu: true,
@@ -1412,7 +1412,7 @@ export const asyncRouterMap = [
                 meta: {
                   title: '费用单列表',
                   icon: 'pound',
-                  hidden: true,
+                  hidden: true
                   // permission: 'M_expenseManagementList'
                 }
               },

+ 11 - 3
src/views/bulkManagement/bulkWarehousingOrder/basicInfoModal.vue

@@ -47,7 +47,7 @@
       <a-button id="bulkWarehousingOrder-basicInfo-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
     </div>
     <!-- 供应商 -->
-    <supplier-info-edit-modal :openModal="openSupplierModal" @close="closeSupplierModal" />
+    <supplier-info-edit-modal :openModal="openSupplierModal" @close="closeSupplierModal" @ok="handleOk" :isState="false" />
   </a-modal>
 </template>
 
@@ -113,16 +113,25 @@ export default {
         }
       })
     },
+    // 新增供应商 成功
+    handleOk () {
+      //  获取供应商数据列表,并赋值
+      this.getSupplierList('val')
+    },
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
       )
     },
     // 供应商下拉数据
-    getSupplierList () {
+    getSupplierList (val) {
       supplierAllList().then(res => {
         if (res.status == 200) {
           this.supplierList = res.data
+          if (val) { //  需将新增加的供应商回填,即不需要用户再选一下
+            this.form.supplierSn = this.supplierList[0].supplierSn
+            this.$refs.ruleForm.clearValidate('supplierSn')
+          }
         } else {
           this.supplierList = []
         }
@@ -141,7 +150,6 @@ export default {
     // 关闭供应商弹框
     closeSupplierModal () {
       this.openSupplierModal = false
-      this.getSupplierList()
     }
   },
   watch: {

+ 17 - 1
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -4,7 +4,14 @@
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
         <a id="bulkWarehousingOrderDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-        <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseSn) || '' }}</p>
+        <a-button
+          v-if="isEdit"
+          type="primary"
+          size="small"
+          style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
+          id="bulkWarehousingOrderDetail-edit-btn"
+          @click.stop="handleEdit">编辑</a-button>
+        <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.sparePartsPurchaseNo) || '' }}</p>
       </template>
       <template slot="tags">
         <a-tag color="red" v-if="basicInfoData&&basicInfoData.stateDictValue">{{ basicInfoData.stateDictValue }}</a-tag>
@@ -119,6 +126,11 @@ export default {
       productTotal: null //  合计
     }
   },
+  computed: {
+    isEdit () {
+      return this.basicInfoData && this.basicInfoData.state != 'FINISH'
+    }
+  },
   methods: {
     //  返回列表
     handleBack () {
@@ -143,6 +155,10 @@ export default {
           this.productTotal = null
         }
       })
+    },
+    //  编辑
+    handleEdit () {
+      this.$router.push({ path: `/bulkManagement/bulkWarehousingOrder/edit/${this.basicInfoData.id}/${this.basicInfoData.sparePartsPurchaseSn}` })
     }
   },
   beforeRouteEnter (to, from, next) {

+ 4 - 4
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -24,9 +24,9 @@
               <a-form-item label="产品品牌">
                 <a-select
                   placeholder="请选择产品品牌"
-                  id="inventoryQueryList-productBrandSn"
+                  id="inventoryQueryList-brandSn"
                   allowClear
-                  v-model="queryParam.productBrandSn"
+                  v-model="queryParam.brandSn"
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
@@ -123,7 +123,7 @@ export default {
         productCode: '', //  产品编码
         productName: '', //  产品名称
         productOrigCode: '', //  原厂编码
-        productBrandSn: undefined, //  产品品牌
+        brandSn: undefined, //  产品品牌
         productTypeSn1: '', //  产品分类1
         productTypeSn2: '', //  产品分类2
         productTypeSn3: '', //  产品分类3
@@ -186,7 +186,7 @@ export default {
   methods: {
     //  重置
     resetSearchForm () {
-      this.queryParam.productBrandSn = undefined
+      this.queryParam.brandSn = undefined
       this.queryParam.productTypeSn1 = ''
       this.queryParam.productTypeSn2 = ''
       this.queryParam.productTypeSn3 = ''

+ 1 - 1
src/views/salesManagement/salesQuery/list.vue

@@ -309,7 +309,7 @@ export default {
     },
     // 详情
     handleDetail (row) {
-      this.$router.push({ name: 'salesDetail', params: { id: row.id, sn: row.salesBillSn } })
+      this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn } })
     },
     // 编辑
     handleEdit (row) {

+ 1 - 1
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -47,7 +47,7 @@
                   v-model="queryParam.status"
                   ref="status"
                   id="chainTransferInList-status"
-                  code="PAYMENT_TYPE"
+                  code="URGENT_STATUS"
                   placeholder="请选择状态"
                   allowClear></v-select>
               </a-form-item>

+ 6 - 1
src/views/supplierManagement/supplierInfo/editModal.vue

@@ -85,7 +85,7 @@
             placeholder="请输入主营内容(最多200个字符)"
             allowClear />
         </a-form-model-item>
-        <a-form-model-item label="状态" prop="enabledFlag">
+        <a-form-model-item label="状态" prop="enabledFlag" v-if="isState">
           <a-radio-group
             name="radioGroup"
             v-model="form.enabledFlag"
@@ -116,6 +116,10 @@ export default {
     itemId: {
       type: [Number, String],
       default: ''
+    },
+    isState: { //  是否显示状态
+      type: Boolean,
+      default: true
     }
   },
   computed: {
@@ -206,6 +210,7 @@ export default {
           supplierSave(form).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)
+              _this.$emit('ok')
               _this.isShow = false
             }
           })

+ 1 - 0
src/views/supplierManagement/supplierInfo/list.vue

@@ -50,6 +50,7 @@
           class="button-info"
           @click="handleEdit(record)"
           id="supplierInfoList-edit-btn">编辑</a-button>
+        <span v-else>--</span>
       </template>
       <!-- 状态 -->
       <template slot="status" slot-scope="text, record">