lilei 2 éve
szülő
commit
e7b929f38b

+ 1 - 0
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -59,6 +59,7 @@
                 <a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="bulkWarehousingOrderList-reset">重置</a-button>
                 <a-button
                   style="margin-left: 10px"
+                  v-if="$hasPermissions('B_sparePartsExport')"
                   type="primary"
                   class="button-warning"
                   @click="handleExport"

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

@@ -90,7 +90,7 @@
         </a-form>
         <!-- 操作按钮 -->
         <div class="table-operator">
-          <a-button type="primary" class="button-error" @click="openGuideModal=true">批量导入</a-button>
+          <a-button type="primary" class="button-error" v-if="$hasPermissions('B_sendOutPlImport')" @click="openGuideModal=true">批量导入</a-button>
         </div>
       </div>
       <!-- 列表 -->

+ 1 - 1
src/views/salesReturnManagement/pickUp/list.vue

@@ -99,7 +99,7 @@
             size="small"
             type="link"
             class="button-error"
-            v-if="record.state == 'AUDIT_PASS'&&$hasPermissions('M_detailPickUp')"
+            v-if="record.state == 'AUDIT_PASS'&&$hasPermissions('B_pickUp')"
             @click="handlePickUp(record)"
             id="pickUp-detail-btn">提货</a-button>
         </template>

+ 15 - 0
src/views/salesReturnManagement/salesReturn/chooseDepartUserModal.vue

@@ -81,6 +81,7 @@
 import { VSelect, Upload } from '@/components'
 import dingDepartUser from '@/views/common/dingDepartUser.js'
 import employee from '@/views/expenseManagement/expenseReimbursement/employee.js'
+import { sign } from 'core-js/fn/number'
 export default {
   name: 'ChooseDepartUserModal',
   components: { dingDepartUser, employee, VSelect, Upload },
@@ -173,6 +174,20 @@ export default {
         }
       })
     },
+    getDetail (data) {
+      this.form = Object.assign(this.form, {
+        salesReturnType: data.salesReturnType,
+        applyPersonSn: data.applyPersonSn
+      })
+      // 获取附件列表
+      this.form.attachmentList = ''
+      this.attachList = data.attachmentList
+      this.$nextTick(() => {
+        if (this.attachList.length) {
+          this.$refs.attachList.setFileList(this.attachList)
+        }
+      })
+    },
     resetForm () {
       this.$nextTick(() => {
         this.$refs.ruleForm.resetFields()

+ 4 - 25
src/views/salesReturnManagement/salesReturn/list.vue

@@ -159,7 +159,7 @@
               id="salesReturn-edit-btn">{{ record.salesReturnBillSource == 'SALES' ? '编辑' : '改单' }}</a-button>
             <a-button
               size="small"
-              v-if="record.billStatus == 'WAIT_SUBMIT' && $hasPermissions('B_salesReturnDel')"
+              v-if="(record.billStatus == 'WAIT_SUBMIT'|| record.billStatus == 'AUDIT_REJECT') && $hasPermissions('B_salesReturnDel')"
               type="link"
               class="button-error"
               @click="handleDel(record)"
@@ -168,9 +168,9 @@
               size="small"
               type="link"
               class="button-info"
-              v-if="record.salesReturnBillSource == 'SALES'&&record.billStatus == 'AUDIT_REJECT'&& $hasPermissions('B_salesReturnAgainEdit')"
-              @click="handleAgainEdit(record)"
-              id="salesReturn-edit-btn">再次编辑</a-button>
+              v-if="record.billStatus == 'AUDIT_REJECT'&& $hasPermissions('B_salesReturnAgainSubmit')"
+              @click="handleEdit(record)"
+              id="salesReturn-edit-btn">再次提交</a-button>
             <a-button
               size="small"
               type="link"
@@ -336,27 +336,6 @@ export default {
     handleEdit (row) {
       this.$router.push({ name: 'salesReturnEdit', params: { sn: row.salesReturnBillSn, buyerSn: row.buyerSn } })
     },
-    // 再次编辑
-    handleAgainEdit (row) {
-      const _this = this
-      this.$confirm({
-        title: '提示',
-        content: '系统将自动生成一个新的销售退货单,与原单据内容相同。确认再次编辑吗?',
-        centered: true,
-        onOk () {
-          _this.spinning = true
-          updateAgain({ salesReturnBillSn: row.salesReturnBillSn }).then(res => {
-            if (res.status == 200) {
-              _this.$message.success(res.message)
-              _this.$refs.table.refresh()
-              _this.spinning = false
-            } else {
-              _this.spinning = false
-            }
-          })
-        }
-      })
-    },
     // 详情
     handleDetail (row) {
       this.$router.push({ name: 'salesReturnDetail', params: { sn: row.salesReturnBillSn } })

+ 4 - 1
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -130,7 +130,7 @@
         id="salesReturn-handleSubmit">提交</a-button>
     </div>
     <!-- 选择审核人员 -->
-    <chooseDepartUserModal :openModal="openDepartUserModal" @close="openDepartUserModal=false" @submit="handleSubmit"></chooseDepartUserModal>
+    <chooseDepartUserModal ref="chooseDepart" :openModal="openDepartUserModal" @close="openDepartUserModal=false" @submit="handleSubmit"></chooseDepartUserModal>
     <!-- 导入产品 -->
     <importGuideModal :openModal="openGuideModal" :params="{salesReturnBillSn: $route.params.sn}" @close="closeGuideModel" @ok="hanldeOk" />
     <!-- 批量设置退货原因 -->
@@ -350,6 +350,9 @@ export default {
     getOrderDetail () {
       salesReturnDetail({ sn: this.orderSn }).then(res => {
         this.ordeDetail = res.data || null
+        if (res.data.billStatus == 'AUDIT_REJECT') {
+          this.$refs.chooseDepart.getDetail(res.data)
+        }
       })
     },
     // 删除产品

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.0.215/ocs-admin',
+        // target: 'http://192.168.0.215/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  Á·Ï°
-        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
+        target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
         ws: false,
         changeOrigin: true,
         pathRewrite: {