no message

src/api/material-system/material.js

@@ -1,75 +0,0 @@
-import request, { postBlob, handleImport } from '@/utils/request'
-
-export function newGetMaterialList(data) {
-  return request({
-    url: `/sys/material/zfire/list?moduleId=${data.moduleId}`,
-    method: 'post',
-    data
-  })
-}
-
-export function newGetMaterialListExport(data, name) {
-  return postBlob({
-    url: '/sys/material/zfire/list/export',
-    data,
-    name
-  })
-}
-
-export function newMaterialListImport(data) {
-  return handleImport('sys/material/batch/update', data.formdata, data.id || '')
-}
-
-// 获取辅材列表
-export function getMaterialList(params) {
-  return request({
-    url: '/sys/material/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取辅材信息
-export function getMaterial(params) {
-  return request({
-    url: '/sys/material/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 新增辅材
-export function addMaterial(params) {
-  return request({
-    url: '/sys/material/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 编辑辅材
-export function editMaterial(params) {
-  return request({
-    url: '/sys/material/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 辅材增量同步
-export function materialSync(params) {
-  return request({
-    url: '/sys/material/sync',
-    method: 'post',
-    params
-  })
-}
-
-// 辅材全量同步
-export function materialAllSync(params) {
-  return request({
-    url: '/sys/material/all-sync',
-    method: 'post',
-    params
-  })
-}

src/api/material-system/vender.js

@@ -82,77 +82,3 @@ export function getVenderGoodsSheet(params) {
     params
   })
 }
-
-// ,,
-
-export function newGetVenderList(data) {
-  return request({
-    url: `/vender/master/zfire/list?moduleId=${data.moduleId}`,
-    method: 'post',
-    data
-  })
-}
-
-// ------------------------------------------
-
-// 获取供应商资料列表
-export function getVenderList(params) {
-  return request({
-    url: '/vender/master/list',
-    method: 'get',
-    params
-  })
-}
-
-// 获取供应商产品关系维护单列表
-export function getVenderGoodsSheetList(params) {
-  return request({
-    url: '/vender/manager/list',
-    method: 'get',
-    params
-  })
-}
-
-export function newGetVenderListExport(data, name) {
-  return postBlob({
-    url: '/vender/master/zfire/list/export',
-    data,
-    name
-  })
-}
-
-// 获取供应商资料信息
-export function getVender(params) {
-  return request({
-    url: '/vender/master/detail',
-    method: 'get',
-    params
-  })
-}
-
-// 新增供应商资料
-export function addVender(params) {
-  return request({
-    url: '/vender/master/add',
-    method: 'post',
-    data: params
-  })
-}
-
-// 编辑供应商资料
-export function editVender(params) {
-  return request({
-    url: '/vender/master/update',
-    method: 'post',
-    data: params
-  })
-}
-
-// 获取供应商产品信息列表
-export function getVenderGoodsList(params) {
-  return request({
-    url: '/vender/goods/list',
-    method: 'get',
-    params
-  })
-}

src/api/material-system/vender/shop-purchase-apply.js

@@ -1,17 +1,9 @@
 import request, { postBlob } from '@/utils/request'
 
-// 获取网点采购单列表
-export function getPurchaseApplySheetList(params) {
-  return request({
-    url: '/vender/shop-purchase-apply/list',
-    method: 'get',
-    params
-  })
-}
 // 获取新网点采购单列表
 export function getNewPurchaseApplySheetList(data) {
   return request({
-    url: `/vender/shop-purchase-apply/zfire/list?moduleId=${data.moduleId}`,
+    url: `/vender/check/purchase/list?moduleId=${data.moduleId}`,
     method: 'post',
     data
   })
@@ -20,44 +12,44 @@ export function getNewPurchaseApplySheetList(data) {
 // 导出
 export function exportNewPurchaseApplySheetList(data, name) {
   return postBlob({
-    url: 'vender/shop-purchase-apply/zfire/list/export',
+    url: '/vender/check/purchase/list/export',
     data,
     name
   })
 }
 
-// 获取网点采购单信息
-export function getPurchaseApplySheet(params) {
+// 核实网点采购单
+export function verifyPurchaseApplySheet(params) {
   return request({
-    url: '/vender/shop-purchase-apply/detail',
-    method: 'get',
+    url: '/vender/check/purchase/verify',
+    method: 'post',
     params
   })
 }
 
-// 编辑网点采购单
-export function editPurchaseApplySheet(params) {
+// 撤消网点采购单
+export function revokePurchaseApplySheet(params) {
   return request({
-    url: '/vender/shop-purchase-apply/update',
+    url: '/vender/check/purchase/revoke',
     method: 'post',
-    data: params
+    params
   })
 }
 
-// 核实网点采购单
-export function verifyPurchaseApplySheet(params) {
+// 获取网点采购单信息
+export function getPurchaseApplySheet(params) {
   return request({
-    url: '/vender/shop-purchase-apply/verify',
-    method: 'get',
+    url: '/vender/check/purchase/detail',
+    method: 'post',
     params
   })
 }
 
-// 撤消网点采购单
-export function revokePurchaseApplySheet(params) {
+// 编辑网点采购单
+export function editPurchaseApplySheet(params) {
   return request({
-    url: '/vender/shop-purchase-apply/revoke',
-    method: 'get',
-    params
+    url: '/vender/check/purchase/update',
+    method: 'post',
+    data: params
   })
 }

src/global-text-processor.js

@@ -94,8 +94,8 @@ export const GlobalTextProcessor = {
       updated() {
         this.$nextTick(() => {
           this.processTextNodes(this.$el)
-          this.autoSelect('operation-btns')
-          this.autoSelect('list-display-control-view')
+          // this.autoSelect('operation-btns')
+          // this.autoSelect('list-display-control-view')
           this.autoHtmlSelect('title')
         })
       },
@@ -116,9 +116,9 @@ export const GlobalTextProcessor = {
           // 遍历子节点并处理文本内容
           if (el.nodeType === Node.ELEMENT_NODE) {
             // 跳过 table-body中的td 元素
-            if (el.nodeName.toLowerCase() === 'td') {
-              return
-            }
+            // if (el.nodeName.toLowerCase() === 'td') {
+            //   return
+            // }
             Array.from(el.childNodes).forEach(child => {
               if (child.nodeType === Node.TEXT_NODE) {
                 let text = child.textContent

src/views/auxiliaryFittings/vender/components/ShopPurchaseArea.vue

@@ -7,19 +7,14 @@
     label-position="left"
     label-width="90px"
   >
-    <el-form-item v-if="formDisabled" label="单据编号" prop="sheetId">
-      <el-input disabled :value="dataForm.sheetId" />
+    <el-form-item v-if="formDisabled" label="单据编号" prop="purchaseId">
+      <el-input disabled :value="dataForm.purchaseId" />
     </el-form-item>
     <el-row :gutter="20">
       <el-col :span="8">
-        <el-form-item label="网点" prop="shopId">
-          <el-select v-model="dataForm.shopId" :disabled="formDisabled" placeholder="请选择网点" style="width: 100%">
-            <el-option
-              v-for="(item, index) in authShop"
-              :key="index"
-              :label="shopLabelStrHandle(item)"
-              :value="item.shopId"
-            />
+        <el-form-item label="网点" prop="websitId">
+          <el-select v-model="dataForm.websitId" :disabled="formDisabled" placeholder="请选择网点" style="width: 100%">
+            <el-option v-for="(item, index) in authShop" :key="index" :label="item.name" :value="item.websitId" />
           </el-select>
         </el-form-item>
       </el-col>
@@ -35,15 +30,16 @@
             <el-option
               v-for="(item, index) in venderList"
               :key="index"
-              :label="vendorLabelStrHandle(item)"
+              :label="item.venderName"
               :value="item.venderId"
+              :disabled="item.status !== 'ON'"
             />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="8">
         <el-form-item label="状态" prop="flag">
-          <el-input disabled :value="sheetFlagStr('label', dataForm.flag)" />
+          <!-- <el-input disabled :value="sheetFlagStr('label', dataForm.flag)" /> -->
         </el-form-item>
       </el-col>
     </el-row>
@@ -115,8 +111,8 @@
       <el-button v-if="checkBtn('edit')" type="primary" :disabled="saveBtn" @click="submitForm('edit')"
         >保 存</el-button
       >
-      <el-button v-if="checkBtn('verify')" type="success" @click="verifySheet(dataForm.sheetId)">核 实</el-button>
-      <el-button v-if="checkBtn('revoke')" type="danger" @click="revokeSheet(dataForm.sheetId)">撤 消</el-button>
+      <el-button v-if="checkBtn('verify')" type="success" @click="verifySheet(dataForm.purchaseId)">核 实</el-button>
+      <el-button v-if="checkBtn('revoke')" type="danger" @click="revokeSheet(dataForm.purchaseId)">撤 消</el-button>
     </div>
   </el-form>
 </template>
@@ -129,7 +125,8 @@ import {
   verifyPurchaseApplySheet
 } from '@/api/material-system/vender/shop-purchase-apply'
 import { getVenderList } from '@/api/material-system/vender'
-
+import { listPageV2 } from '@/api/auxiliaryFittings/supplier'
+import { getWebsit } from '@/api/customerManagement.js'
 export default {
   name: 'ShopPurchaseArea',
   props: {
@@ -138,7 +135,7 @@ export default {
       default: function () {
         return {
           openType: 'add',
-          sheetId: ''
+          purchaseId: ''
         }
       }
     }
@@ -156,11 +153,11 @@ export default {
       callback()
     }
     return {
-      loading: true,
+      loading: false,
       dataForm: {
-        sheetId: '', // 单据ID
-        shopId: '', // 网点ID
-        shopName: '', // 网点名称
+        purchaseId: '', // 单据ID
+        websitId: '', // 网点ID
+        websitName: '', // 网点名称
         venderId: '', // 供应商ID
         venderName: '', // 供应商名称
         notes2: '', // 备注
@@ -177,7 +174,7 @@ export default {
   },
   computed: {
     formDisabled() {
-      return this.inputParam.openType === 'view' || this.dataForm.sheetId !== ''
+      return this.inputParam.openType === 'view' || this.dataForm.purchaseId !== ''
     },
     goodsTotalCount: function () {
       return this.dataForm && this.dataForm.items ? this.dataForm.items.length : 0
@@ -186,17 +183,33 @@ export default {
   mounted() {
     this.getVenderList()
     this.getDetail()
+    getWebsit({ type: 'C', status: true }).then(res => {
+      this.authShop = res.data
+    })
   },
   methods: {
-    getDetail(id) {
-      this.loading = true
-      // const openType = this.inputParam.openType
-      const sheetId = id || this.inputParam.sheetId
-      getPurchaseApplySheet({ sheetId }).then(res => {
-        this.setDataForm(res.data)
-        this.loading = false
+    // 获取供应商列表
+    getVenderList() {
+      listPageV2({
+        pageNum: 1,
+        pageSize: -1,
+        params: [
+          { param: 'a.status', compare: '=', value: 'ON' },
+          { param: 'a.vender_type', compare: 'like', value: '辅材' }
+        ]
+      }).then(res => {
+        this.venderList = res.data.records
       })
     },
+    getDetail(id) {
+      if (id || this.inputParam.purchaseId) {
+        this.loading = true
+        getPurchaseApplySheet({ purchaseId: id || this.inputParam.purchaseId }).then(res => {
+          this.loading = false
+          this.setDataForm(res.data)
+        })
+      }
+    },
     cancelForm() {
       this.$parent.$refs.pageRef.refreshList()
       this.$emit('update:isOpen', false)
@@ -212,8 +225,8 @@ export default {
     },
     setDataForm(data) {
       this.dataForm = {
-        sheetId: data.sheetId, // 单据编号
-        shopId: data.shopId, // 网点ID
+        purchaseId: data.purchaseId, // 单据编号
+        websitId: data.websitId, // 网点ID
         venderId: data.venderId, // 供应商Id
         flag: data.flag,
         notes: data.notes, // 备注
@@ -228,18 +241,13 @@ export default {
         verify: this.dataForm.flag === 1
       }
       // 检查按钮权限
-      return this.checkBtnRole(type) && typeMap[type]
-    },
-    // 获取供应商列表
-    getVenderList() {
-      getVenderList({ pageNum: 1, pageSize: -1, flag: 1 }).then(res => {
-        this.venderList = res.data.records
-      })
+      return true // this.checkBtnRole(type) && typeMap[type]
     },
+
     // 核实 采购申请单
-    verifySheet(sheetId) {
+    verifySheet(purchaseId) {
       this.$confirm(
-        `此操作将核实 ${sheetId} 单据，<span style="color: #ff0000;">当前内容如果已修改将忽略保存</span>，是否继续?`,
+        `此操作将核实 ${purchaseId} 单据，<span style="color: #ff0000;">当前内容如果已修改将忽略保存</span>，是否继续?`,
         '提示',
         {
           confirmButtonText: '确定',
@@ -250,11 +258,11 @@ export default {
       )
         .then(() => {
           this.loading = true
-          verifyPurchaseApplySheet({ sheetId: sheetId }).then(
+          verifyPurchaseApplySheet({ purchaseId: purchaseId }).then(
             () => {
               setTimeout(() => {
                 this.inputParam.openType = 'view'
-                this.getDetail(sheetId)
+                this.getDetail(purchaseId)
                 this.$successMsg('核实成功')
                 this.loading = false
               }, 2000)
@@ -267,14 +275,14 @@ export default {
         .catch(() => console.log('取消'))
     },
     // 撤消单据
-    revokeSheet(sheetId) {
-      this.$confirm(`此操作将撤消 ${sheetId} 单据, 是否继续?`, '提示', {
+    revokeSheet(purchaseId) {
+      this.$confirm(`此操作将撤消 ${purchaseId} 单据, 是否继续?`, '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       })
         .then(() => {
-          revokePurchaseApplySheet({ sheetId: sheetId }).then(() => {
+          revokePurchaseApplySheet({ purchaseId: purchaseId }).then(() => {
             this.cancelForm()
             this.$successMsg('撤消成功')
           })

src/views/auxiliaryFittings/vender/shop-purchase/index.vue

@@ -1,12 +1,5 @@
 <template>
   <div style="height: 100%">
-    <template v-if="shopPurchaseArea && shopPurchaseAreaParam.openType !== 'add'">
-      <el-page-header
-        :content="shopPurchaseAreaParam.openType === 'view' ? '查看网点采购单' : '编辑网点采购单'"
-        @back="backUpdPage"
-      />
-      <el-divider />
-    </template>
     <div v-show="showListArea" style="height: 100%">
       <template-page
         ref="pageRef"
@@ -20,13 +13,27 @@
       >
       </template-page>
     </div>
-    <!-- 新增编辑单据 -->
-    <shop-purchase-area
-      v-if="shopPurchaseArea"
-      :is-open.sync="shopPurchaseArea"
-      :input-param="shopPurchaseAreaParam"
-      @getList="$refs.pageRef.refreshList()"
-    />
+    <template v-if="shopPurchaseArea">
+      <div style="box-sizing: border-box; padding: 20px">
+        <el-page-header
+          :content="
+            shopPurchaseAreaParam.openType !== 'add'
+              ? '新增网点采购单'
+              : shopPurchaseAreaParam.openType === 'view'
+              ? '查看网点采购单'
+              : '编辑网点采购单'
+          "
+          @back="backUpdPage"
+        />
+        <el-divider />
+        <!-- 新增编辑单据 -->
+        <shop-purchase-area
+          :is-open.sync="shopPurchaseArea"
+          :input-param="shopPurchaseAreaParam"
+          @getList="$refs.pageRef.refreshList()"
+        />
+      </div>
+    </template>
     <!-- 预览表单 -->
     <print-form
       v-if="isPreview"
@@ -40,7 +47,6 @@
 <script>
 import {
   verifyPurchaseApplySheet,
-  getPurchaseApplySheetList,
   revokePurchaseApplySheet,
   getPurchaseApplySheet,
   getNewPurchaseApplySheetList,
@@ -49,17 +55,17 @@ import {
 import ShopPurchaseArea from '../components/ShopPurchaseArea'
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
+import operation_mixin from '@/components/template/operation_mixin.js'
 export default {
   name: 'ShopPurchase',
   components: { ShopPurchaseArea, TemplatePage },
-  mixins: [import_mixin],
-
+  mixins: [import_mixin, operation_mixin],
   data() {
     return {
       shopPurchaseArea: false,
       shopPurchaseAreaParam: {
         openType: 'add',
-        sheetId: ''
+        purchaseId: ''
       },
       dataList: null, // 列表数据
       listLoading: true, // 列表加载loading
@@ -71,40 +77,26 @@ export default {
         submitTime: '', // 创建时间
         flag: '', // 状态
         keyword: '', // 关键词
-        sheetId: '', // 单据编号
+        purchaseId: '', // 单据编号
         shopId: ''
       },
       purchaseForm: {},
       isPreview: false,
-      // 事件组合
-      optionsEvensGroup: [
-        [
-          [
-            {
-              name: '新增单据',
-              click: () => {
-                this.addOrEdit('add')
-              },
-              isRole: this.checkBtnRole('add')
-            }
-          ]
-        ]
-      ],
       // 表格属性
       tableAttributes: {
         // 启用勾选列
-        selectColumn: true,
-        columnExpand: (h, { row, index, columm }) => {
-          return (
-            <div style="padding-left:95px">
-              <el-form label-position="left" inline class="demo-table-expand">
-                <el-form-item label="备注">
-                  <span>{row.notes2}</span>
-                </el-form-item>
-              </el-form>
-            </div>
-          )
-        }
+        selectColumn: false
+        // columnExpand: (h, { row, index, columm }) => {
+        //   return (
+        //     <div style="padding-left:95px">
+        //       <el-form label-position="left" inline class="demo-table-expand">
+        //         <el-form-item label="备注">
+        //           <span>{row.notes2}</span>
+        //         </el-form-item>
+        //       </el-form>
+        //     </div>
+        //   )
+        // }
       },
       // 表格事件
       tableEvents: {
@@ -116,27 +108,29 @@ export default {
   computed: {
     showListArea: function () {
       return !(this.isPreview || this.shopPurchaseArea)
+    },
+    optionsEvensGroup() {
+      return [
+        [
+          [
+            this.optionsEvensAuth('add', {
+              click: () => {
+                this.addOrEdit('add')
+              }
+            })
+          ]
+        ]
+      ]
     }
   },
-  created() {
-    //       this.$refs.pageRef.refreshList();
-  },
   methods: {
     // 新增编辑 采购入库单
     addOrEdit(type, id) {
       this.shopPurchaseArea = true
       this.shopPurchaseAreaParam.openType = type
-      this.shopPurchaseAreaParam.sheetId = id
-    },
-    // 操作事件
-    handleCommand(param) {
-      console.log(333, param)
-      if (param[1] === 'view' || param[1] === 'edit') {
-        this.addOrEdit(param[1], param[0])
-      } else {
-        this[param[1] + 'Sheet'](param[0])
-      }
+      this.shopPurchaseAreaParam.purchaseId = id
     },
+
     backUpdPage() {
       this.$refs.pageRef.refreshList()
       this.shopPurchaseArea = false
@@ -156,51 +150,80 @@ export default {
     selectionChange(data) {
       this.recordSelected = data
     },
-    operation() {
-      return (h, { row, index, column }) => {
-        return (
-          <div class="operation-btns">
-            <el-dropdown onCommand={p => this.handleCommand(p)}>
-              <el-button type="text">
-                更多
-                <i class="el-icon-arrow-down el-icon--right" />
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                {this.checkBtnRole('view') ? (
-                  <el-dropdown-item icon="el-icon-view" command={[row.sheetId, 'view']}>
-                    查看
-                  </el-dropdown-item>
-                ) : null}
-
-                {row.flag === 1 ? (
-                  <div>
-                    {this.checkBtnRole('edit') ? (
-                      <el-dropdown-item icon="el-icon-edit" command={[row.sheetId, 'edit']}>
-                        编辑
-                      </el-dropdown-item>
-                    ) : null}
-                    {this.checkBtnRole('verify') ? (
-                      <el-dropdown-item icon="el-icon-lock" command={[row.sheetId, 'verify']}>
-                        核实
-                      </el-dropdown-item>
-                    ) : null}
-                    {this.checkBtnRole('revoke') ? (
-                      <el-dropdown-item icon="el-icon-unlock" command={[row.sheetId, 'revoke']}>
-                        撤消
-                      </el-dropdown-item>
-                    ) : null}
-                    {this.checkBtnRole('view') ? (
-                      <el-dropdown-item icon="el-icon-printer" command={[row.sheetId, 'view']}>
-                        预览
-                      </el-dropdown-item>
-                    ) : null}
-                  </div>
-                ) : null}
-              </el-dropdown-menu>
-            </el-dropdown>
-          </div>
-        )
+    // 操作事件
+    handleCommand(param) {
+      if (param[1] === 'view' || param[1] === 'edit') {
+        this.addOrEdit(param[1], param[0])
+      } else {
+        this[param[1] + 'Sheet'](param[0])
       }
+    },
+    // 撤消单据
+    revokeSheet(purchaseId) {
+      this.$confirm(`此操作将撤消 ${purchaseId} 单据, 是否继续?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          revokePurchaseApplySheet({ purchaseId: purchaseId }).then(() => {
+            this.$refs.pageRef.refreshList()
+
+            this.$successMsg('撤消成功')
+          })
+        })
+        .catch(() => console.log('取消'))
+    },
+    // 审核单据
+    verifySheet(purchaseId) {
+      this.$confirm(`此操作将审核 ${purchaseId} 单据, 是否继续?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          verifyPurchaseApplySheet({ purchaseId: purchaseId }).then(() => {
+            this.$refs.pageRef.refreshList()
+
+            this.$successMsg('审核成功')
+          })
+        })
+        .catch(() => console.log('取消'))
+    },
+    operation() {
+      return this.operationBtn({
+        view: {
+          click: ({ row, index, column }) => {
+            this.handleCommand([row.purchaseId, 'view'])
+          }
+        },
+        edit: {
+          conditions: ({ row, index, column }) => {
+            return row.flag === 1
+          },
+          click: ({ row, index, column }) => {
+            this.handleCommand([row.purchaseId, 'edit'])
+          }
+        },
+        verify: {
+          prompt: '确定核实吗？',
+          conditions: ({ row, index, column }) => {
+            return row.flag === 1
+          },
+          click: ({ row, index, column }) => {
+            this.handleCommand([row.purchaseId, 'verify'])
+          }
+        },
+        revoke: {
+          prompt: '确定撤消吗？',
+          conditions: ({ row, index, column }) => {
+            return row.flag === 1
+          },
+          click: ({ row, index, column }) => {
+            this.handleCommand([row.purchaseId, 'revoke'])
+          }
+        }
+      })
     }
   }
 }