调整

src/views/sales_control/adjust_warehouse.vue

@@ -91,7 +91,7 @@ export default {
             >
               查看
             </el-button>
-            {row.examineStatus != 'OK' ? (
+            {row.examineStatus != 'OK'||row.examineStatus != 'FAIL' ? (
               <el-button
                 size="mini"
                 type="text" onClick={() => {
@@ -102,7 +102,7 @@ export default {
                 审批
               </el-button>
             ) : null}
-            {row.examineStatus != 'OK' ? (
+            {row.examineStatus != 'OK' ||row.examineStatus != 'FAIL'  ? (
             <el-popconfirm
               onOnConfirm={() => {
                 deleteCustomerStockOrder({ id: row.id }).then(res => {

src/views/sales_control/components/WarehouseExamine.vue

@@ -39,7 +39,7 @@
           <el-col :xs="24" :ms="24" :lg="24">
             <div>
               <el-button type="primary" size="mini" @click="handelSubmit('OK')">同意</el-button>
-              <el-button size="mini" @click="handelSubmit('WAIT')">驳回</el-button>
+              <el-button size="mini" @click="handelSubmit('FAIL')">驳回</el-button>
             </div>
           </el-col>
         </el-row>

src/views/sales_control/sales_management/components/customer_sales_details.vue

@@ -147,7 +147,7 @@ export default {
   },
   created() {
     this.isFront = JSON.parse(localStorage.getItem('supply_user')).isFront
-
+    console.log(this.isFront)
     if (this.detailsId) {
       getFrontOrderDetail({ id: this.detailsId }).then(res => {
         this.dataList = res.data.orders

src/views/sales_control/sales_management/components/return_sales_form.vue

@@ -266,6 +266,48 @@ export default {
         addRefund(params).then(res => {
           this.$successMsg('新增成功')
           this.salesId = res.data
+          this.column=[
+            {
+              prop: 'materialName',
+              label: '产品名称',
+              width: '180'
+            },
+            {
+              prop: 'materialCode',
+              label: '物料编码',
+              width: '180'
+            },
+            {
+              prop: 'specification',
+              label: '规格型号',
+              width: '300'
+            },
+            {
+              prop: 'qty',
+              align: 'left',
+              label: '发货数量',
+              width: '180'
+            },
+            {
+              prop: 'refundQty',
+              align: 'left',
+              label: '退货数量',
+              width: '180',
+            },
+            {
+              prop: 'diffQty',
+              align: 'left',
+              label: '已退数量',
+              width: '180'
+
+            },
+            {
+              prop: 'notes',
+              label: '备注',
+              width: '180',
+              type: 'text'
+            }
+          ]
 
           // this.$parent.pageType = 0
           this.dis = false