暂存

src/views/sellOut/bargainList/columns.js

@@ -264,7 +264,7 @@ const editColumns = [
   },
   {
     prop: "before_rate",
-    label: "议价前税率",
+    label: "议价前毛利率",
     append: '%',
     span: 6
   },
@@ -288,7 +288,7 @@ const editColumns = [
 
   {
     prop: "after_rate",
-    label: "议价后税率",
+    label: "议价后毛利率",
     append: '%',
     span: 6
   },

src/views/sellOut/returnOrder/ShowDataTableColumns.js

@@ -1,74 +1,72 @@
-export default  [
+export default [
 
-    {
-      prop: "thNo",
-      label: "销售售后退货单编号",
-    },
-    {
-      prop: "status",
-      label: "售后退货单状态",
-      _slot_: "status",
-    },
-    {
-      prop: "returnCode",
-      label: "销售售后申请单编号",
-    },
-    {
-      prop: "cgder",
-      label: "申请人",
-    },
-    {
-      prop: "outCode",
-      label: "发货申请单编号",
-    },
-    {
-      prop: "return_msg",
-      label: "退回原因",
-    },
-    
-   
-    {
-      prop: "orderCode",
-      label: "销售订单编号",
-    },
-    {
-      prop: "class_cat",
-      label: "商品分类",
-    },
-   
-    // {
-    //   prop: "good_code",
-    //   label: "商品编号",
-    // },
-    {
-      prop: "good_code",
-      label: "商品属性编号",
-    },
-    {
-      prop: "good_name",
-      label: "商品名称",
-    },
-    {
-      prop: "contactor",
-      label: "退回收货联系人",
-    },
-    {
-      prop: "mobile",
-      label: "退回收货联系人电话",
-    },
-    {
-      prop: "addr",
-      label: "退回收货地址",
-      // span:24
-    },
-    {
-      prop: "updatetime",
-      label: "更新时间",
-    },
-    
-    {
-      prop: "addtime",
-      label: "创建时间",
-    },
-  ]
+  {
+    prop: "thNo",
+    label: "售后退货单编号",
+    span: 6
+  },
+  {
+    prop: "status",
+    label: "售后退货单状态",
+    _slot_: "status",
+    span: 6
+  },
+  {
+    prop: "returnCode",
+    label: "售后申请单编号",
+    span: 6
+  },
+  {
+    prop: "apply_name",
+    label: "申请人",
+    span: 6
+  },
+  {
+    prop: "outCode",
+    label: "发货申请单编号",
+    span: 6
+  },
+
+
+
+  {
+    prop: "orderCode",
+    label: "订单编号",
+    span: 6
+  },
   
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
+  },
+  {
+    prop: "contactor",
+    label: "退回联系人",
+    span: 6
+  },
+  {
+    prop: "mobile",
+    label: "退回联系电话",
+    span: 6
+  },
+  {
+    prop: "return_msg",
+    label: "退回原因",
+    span: 12
+  },
+  {
+    prop: "addtime",
+    label: "创建时间",
+    span: 6
+  },
+  {
+    prop: "addr",
+    label: "退回联系地址",
+    span: 18
+    // span:24
+  },
+
+ 
+]
+

src/views/sellOut/returnOrder/components/return-record.vue

@@ -4,13 +4,14 @@
     :loading="loading"
     :model="ruleForm"
     status-icon
+    :size="'mini'"
     :rules="rulesThis"
-    label-width="120px"
+    label-width="115px"
     style="width: 100%"
     class="demo-ruleForm"
   >
     <el-row>
-      <el-col :span="12">
+      <el-col :span="8">
         <el-form-item label="退货总数量" prop="return_num">
           <el-input
             disabled
@@ -18,26 +19,35 @@
             placeholder="退货总数量"
           ></el-input>
         </el-form-item>
-      </el-col>
-      <el-col :span="12">
         <el-form-item label="可销售数量" prop="normal">
           <el-input
             :disabled="
-              !(status === '0' && powers.some((item) => item == '047'))
+              !(
+                status === '1' &&
+                powers &&
+                powers.length > 0 &&
+                powers.some((item) => item == '047')
+              )
             "
             v-model="ruleForm.normal"
             placeholder="可销售数量"
           ></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="24">
+      <el-col :span="16">
         <el-form-item label="其他备注" prop="remark">
           <el-input
             :disabled="
-              !(status === '0' && powers.some((item) => item == '047'))
+              !(
+                status === '1' &&
+                powers &&
+                powers.length > 0 &&
+                powers.some((item) => item == '047')
+              )
             "
             type="textarea"
             maxlength="250"
+            :rows="3"
             show-word-limit
             placeholder="请填写备注"
             v-model="ruleForm.remark"
@@ -45,7 +55,15 @@
           </el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="24"  v-if="status === '0' && powers.some((item) => item == '047')||ruleForm.product_go.length>0">
+      <el-col
+        :span="24"
+        v-if="
+          status === '1' &&
+          powers &&
+          powers.length > 0 &&
+          powers.some((item) => item == '047')
+        "
+      >
         <el-form-item label="异常情况记录" :size="'mini'">
           <el-form
             :model="ruleForm"
@@ -67,7 +85,12 @@
                 fixed="right"
                 label="操作"
                 width="80"
-                v-if="status === '0' && powers.some((item) => item == '047')"
+                v-if="
+                  status === '1' &&
+                  powers &&
+                  powers.length > 0 &&
+                  powers.some((item) => item == '047')
+                "
               >
                 <template slot="header" slot-scope="scope">
                   <!-- v-if="status == '1' || status == '0'" -->
@@ -120,7 +143,12 @@
       <el-col
         :span="24"
         style="text-align: right; margin: -5px 0 20px 0"
-        v-if="status === '0' && powers.some((item) => item == '047')"
+        v-if="
+          status === '1' &&
+          powers &&
+          powers.length > 0 &&
+          powers.some((item) => item == '047')
+        "
       >
         <el-button type="primary" class="fr" :size="'mini'" @click="submitForm"
           >保 存
@@ -231,6 +259,9 @@ export default {
       }
     },
   },
+  mounted() {
+    this.initForm();
+  },
   methods: {
     async initForm() {
       this.loading = true;
@@ -248,6 +279,7 @@ export default {
           this.$refs.ruleForm.clearValidate();
           this.status = "";
           this.arr = [];
+          console.log(this.sitem);
           let { child, status, normal_num, remark, return_num } = this.sitem;
           this.status = status;
           if (child) {
@@ -328,7 +360,7 @@ export default {
         page: 1,
         size: 100,
         type: "1",
-        // status: "3",
+        status: "3",
       });
       if (res && res.code === 0 && res.data) {
         const { list } = res.data;

src/views/sellOut/returnOrder/components/returnCheck.vue

@@ -62,7 +62,7 @@
             fixed="right"
             label="操作"
             width="80"
-            v-if="status === '2' && powers.some((item) => item == '042')"
+            v-if="status === '2' && powers && powers.length > 0 &&powers.some((item) => item == '042')"
           >
             <template slot-scope="scope">
               <el-tooltip
@@ -101,7 +101,7 @@
         <el-col
           :span="24"
           style="text-align: right; padding: 30px 0 10px 0"
-          v-if="status === '2' && powers.some((item) => item == '042')"
+          v-if="status === '2' &&powers && powers.length > 0 && powers.some((item) => item == '042')"
         >
           <el-button type="primary" :size="'mini'" @click="submitForm"
             >保 存
@@ -116,7 +116,7 @@ import asyncRequest from "@/apis/service/sellOut/returnOrder";
 import resToken from "@/mixins/resToken";
 import config from "./columns"; //表格列参数
 export default {
-  name: "zxAfterSaleOrderDetail",
+  name: "returnCheck",
   props: ["id", "newTime", "sitem"],
 
   mixins: [resToken],
@@ -124,7 +124,7 @@ export default {
     powers() {
       let tran =
         this.$store.getters.btnList.find(
-          (item) => item.menu_route == "zxAfterSaleOrderDetail"
+          (item) => item.menu_route == "returnOrderDetail"
         ) || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
@@ -173,7 +173,6 @@ export default {
   methods: {
     async initForm() {
       this.loading = true;
-      this.columns = [];
       await this.resetForm();
       this.loading = false;
     },
@@ -254,7 +253,7 @@ export default {
     //保存某一行
     checkRow(rowIndex) {
       const { check_value, check_remark } = this.tableForm.product_go[rowIndex];
-      if (check_value!=="1"&&check_value!=="2") {
+      if (check_value !== "1" && check_value !== "2") {
         this.$message.warning("审核情况不能为空!");
         return;
       }

src/views/sellOut/returnOrder/detail.vue

@@ -4,10 +4,8 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <!-- <p>{{ status }}---{{ powers }}</p> -->
-       <div class="detail-page-title">
-        <span>销售售后退货单编号：</span><span v-if="sitem">{{ qid }}</span>
-       </div>
+      <p>{{ status }}---{{ powers }}</p>
+
       <!-- <status-bar
         v-if="newTime !== ''"
         :newTime="newTime"
@@ -16,8 +14,8 @@
       /> -->
       <el-tabs v-model="activeTabs">
         <el-tab-pane label="业务详情" name="1">
-          <el-collapse v-model="activeNames" style="margin:-18px 0 0 0">
-            <el-collapse-item title="销售售后退货单详情" name="-1">
+          <el-collapse v-model="activeNames" style="margin: -18px 0 0 0">
+            <el-collapse-item title="售后退货单详情" name="-1">
               <show-data-table
                 :newTime="newTime"
                 v-if="newTime !== ''"
@@ -40,8 +38,10 @@
               </show-data-table>
             </el-collapse-item>
             <el-collapse-item title="退货验收记录" name="0">
+              <!----047--->
               <return-record
                 :sitem="sitem"
+                v-if="newTime !== ''"
                 @refresh="initData"
                 :newTime="newTime"
               ></return-record>
@@ -52,6 +52,7 @@
               name="1"
               v-if="status == '2' || status == '3' || status == '4'"
             >
+              <!----042--->
               <return-check
                 v-if="newTime != ''"
                 :newTime="newTime"
@@ -62,28 +63,32 @@
             <el-collapse-item
               title="业务审核"
               name="2"
-              v-if="status == '3' && powers.some((item) => item == '042')"
+              v-if="status == '3' && powers.some((item) => item == '043')"
             >
+              <!----043--->
               <exam-form
-                :statusList="statusList"
+                :statusList="[
+                  { value: '1', label: '待验货' },
+                  {
+                    value: '2',
+                    label: '待验货审核',
+                  },
+                ]"
                 :newTime="newTime"
                 :disabled="false"
                 :isMust="true"
                 @searchChange="examForm"
               />
-
-              
             </el-collapse-item>
-        
           </el-collapse>
         </el-tab-pane>
         <el-tab-pane label="审批记录" name="2">
-              <process-time-line
-                v-if="newTime !== ''"
-                :newTime="newTime"
-                :type="'CKTHD'"
-                :orderCode="qid"
-              />
+          <process-time-line
+            v-if="newTime !== ''"
+            :newTime="newTime"
+            :type="'CKTHD'"
+            :orderCode="qid"
+          />
         </el-tab-pane>
       </el-tabs>
     </div>

src/views/sellOut/sellOutOrder/columns.js

@@ -291,11 +291,11 @@ const rshowColumns = [{
   span: 6
 },
 
-{
-  prop: "收货仓库信息",
-  label: "收货地址",
-  span: 24
-},
+// {
+//   prop: "收货仓库信息",
+//   label: "收货地址",
+//   span: 24
+// },
 {
   prop: "error_remark",
   label: "备注",

src/views/sellOut/sellOutOrder/detail.vue

@@ -93,7 +93,12 @@
                 :newTime="newTime"
                 v-if="newTime !== ''"
                 :sitem="resitem"
-                :border="returnCode_type === '4'"
+                :border="
+                  !(
+                    (resitem.is_receive === '1' && returnCode_type === '4') ||
+                    (resitem.is_receive === '1' && returnCode_type === '5')
+                  )
+                "
                 :columns="rshowColumns"
               >
                 <template slot="status">
@@ -187,10 +192,46 @@
                   />
                 </template>
               </show-data-table>
+              <show-data-table
+                :newTime="newTime"
+                v-if="
+                  !(resitem.is_receive === '1' && returnCode_type === '4') ||
+                  !(resitem.is_receive === '1' && returnCode_type === '5')
+                "
+                :sitem="resitem"
+                border
+                :columns="returnShowColumns"
+              >
+              </show-data-table>
+              <show-data-table
+                :newTime="newTime"
+                v-if="
+                  newTime !== '' &&
+                  resitem.is_receive === '1' &&
+                  returnCode_type === '5'
+                "
+                :sitem="resitem"
+                border
+                :columns="returnShowResColumns"
+              >
+                <template slot="is_th">
+                  <el-tag
+                    :size="'mini'"
+                    v-text="
+                      (
+                        is_th_options.find(
+                          (item) => item.value == resitem.is_th
+                        ) || {}
+                      ).label || '--'
+                    "
+                  ></el-tag>
+                </template>
+              </show-data-table>
               <return-express
                 :returnCode="returnCode"
                 :newTime="newTime"
                 v-if="newTime !== '' && returnCode_type === '4'"
+                @refresh="initData"
               />
             </el-collapse-item>
           </el-collapse>
@@ -262,6 +303,46 @@ export default {
       statusList: [],
       showColumns: showColumns,
       rshowColumns: sellshowColumns,
+      returnShowColumns: [
+        {
+          prop: "contactor_name",
+          label: "收货联系人",
+          span: 6,
+        },
+        {
+          prop: "mobile",
+          label: "收货联系电话",
+          span: 6,
+        },
+        {
+          prop: "addr",
+          label: "收货地址",
+          span: 12,
+        },
+      ],
+      returnShowResColumns: [
+        {
+          prop: "is_th",
+          label: "费用承担方",
+          _slot_: "is_th",
+          span: 6,
+        },
+        {
+          prop: "post_company",
+          label: "退货物流公司",
+          span: 6,
+        },
+        {
+          prop: "post_code",
+          label: "退货物流单号",
+          span: 6,
+        },
+        {
+          prop: "post_fee",
+          label: "退货物流费用",
+          span: 6,
+        },
+      ],
       sitem: null,
       resitem: null,
       newTime: "",
@@ -322,6 +403,20 @@ export default {
           label: "补发",
         },
       ],
+      is_th_options: [
+        {
+          value: "1",
+          label: "个人承担",
+        },
+        {
+          value: "2",
+          label: "公司承担",
+        },
+        {
+          value: "3",
+          label: "供应商承担",
+        },
+      ],
       code: "",
       did: "", //详情页上的id
     };

src/views/stock/stockCount/components/dataWeido/columns.js

@@ -47,9 +47,9 @@ export default [
           label: "在途库存",
           // sortable: true,
         },
-        {
-          prop: "warn_stock",
-          label: "预警库存",
-        },
+        // {
+        //   prop: "warn_stock",
+        //   label: "预警库存",
+        // },
       
 ]

src/views/stock/stockCount/components/dataWeido/index.vue

@@ -100,23 +100,22 @@
               prop="good_code"
               width="150"
             ></el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               label="属性编码"
               prop="good_type_code"
               width="130"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               label="商品名称"
               prop="good_name"
               min-width="150"
-              :show-overflow-tooltip="true"
+             show-overflow-tooltip
             ></el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               label="商品属性"
               prop="attribute"
               min-width="120"
-              :show-overflow-tooltip="true"
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               label="分类"
               prop="sort_f"

src/views/stock/stockCount/components/spaceCount/columns.js

@@ -24,11 +24,11 @@ export default [
         //   label: "商品编码",
         //   width: "150",
         // },
-        {
-          prop: "type_code",
-          label: "商品属性编码",
-          width: "130",
-        },
+        // {
+        //   prop: "type_code",
+        //   label: "商品属性编码",
+        //   width: "130",
+        // },
         {
           prop: "good_name",
           label: "商品名称",