暂存

scripts/page/indexPage.js

@@ -199,7 +199,7 @@ module.exports = function (inputName, compoenntName) {
    <script>
     import mixinPage from "@/mixins/elPaginationHandle";
     import resToken from "@/mixins/resToken";
-    import statusList from "@/assets/js/statusList";
+    import {statusList} from "@/assets/js/statusList";
     import asyncRequest from "@/apis/service/${inputName}";
     import addEdit from "./addEdit";
     import { mapGetters } from "vuex";

src/assets/js/statusList.js

@@ -2,4 +2,10 @@ const status = [
   { name: "启用", code: "1" },
   { name: "禁用", code: "0" },
 ];
-export default status;
+const order_type_options = [
+  { id: "1", label: "线上商品销售" },
+  { id: "2", label: "项目线上商品销售" },
+  { id: "3", label: "咨询单销售" },
+  { id: "4", label: "项目咨询单销售" },
+]
+export { status, order_type_options };

src/views/goodStore/activeGood/index.vue

@@ -182,7 +182,7 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/goodStore/activeGood";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/goodStore/brand/index.vue

@@ -208,7 +208,7 @@
 <script>
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/goodStore/brand";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/goodStore/dealGoodsPool/detail.vue

@@ -105,7 +105,7 @@
             </el-col>
             <el-col :span="12">
               <el-button
-               v-if="powers.some((item) => item == '024')"
+                v-if="powers.some((item) => item == '024')"
                 type="warning"
                 class="fl"
                 :size="searchSize"
@@ -114,7 +114,7 @@
                 重置
               </el-button>
               <el-button
-               v-if="powers.some((item) => item == '002')"
+                v-if="powers.some((item) => item == '002')"
                 type="primary"
                 :size="searchSize"
                 class="fr"
@@ -124,7 +124,7 @@
                 刷新
               </el-button>
               <el-button
-               v-if="powers.some((item) => item == '003')"
+                v-if="powers.some((item) => item == '003')"
                 type="success"
                 :size="searchSize"
                 style="float: right"
@@ -314,7 +314,6 @@
         :lang="lang"
         @cancel="showLadderPrice = false"
       ></ladder-price> -->
-    
     </div>
     <div v-else>
       <no-auth></no-auth>
@@ -326,7 +325,7 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import asyncRequest from "@/apis/service/goodStore/goodsCost";
 // import ladderPrice from "./ladderPrice";
 // import PeriodDatePicker from "@/components/PeriodDatePicker";
-import statusList from "@/assets/js/statusList";
+import { statusList } from "@/assets/js/statusList";
 import { timestampToTime } from "@/utils/validate";
 import { mapGetters } from "vuex";
 export default {

src/views/goodStore/searchSort/index.vue

@@ -150,7 +150,7 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/goodStore/searchSort";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/goodStore/sort/index.vue

@@ -230,7 +230,7 @@
 import addEdit from "./addEdit";
 import addEditRate from "./addEditRate";
 import asyncRequest from "@/apis/service/goodStore/sort";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/goodStore/specs/index.vue

@@ -208,7 +208,7 @@
 <script>
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/goodStore/specs";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/goodStore/unit/index.vue

@@ -208,7 +208,7 @@
 <script>
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/goodStore/unit";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/interest/account/index.vue

@@ -218,7 +218,7 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import asyncRequest from "@/apis/service/interest/account";
 import addEdit from "./addEdit";
 import resetPassword from "./resetPassword";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
 export default {

src/views/interest/dataShare/index.vue

@@ -132,7 +132,7 @@
 <script>
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/interest/dataShare";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/interest/organize/index.vue

@@ -134,7 +134,7 @@
 import mixinPage from "@/mixins/elPaginationHandle";
 import asyncRequest from "@/apis/service/interest/organize";
 import addEdit from "./addEdit";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import { mapGetters } from "vuex";
 import resToken from "@/mixins/resToken";
 export default {

src/views/interest/role/index.vue

@@ -205,7 +205,7 @@
 <script>
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/interest/role";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";

src/views/process/oing/index.vue

@@ -83,7 +83,7 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/process/oing";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/process/read/index.vue

@@ -83,7 +83,7 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/process/read";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/process/unRead/index.vue

@@ -83,7 +83,7 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/process/unRead";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/purchaseIn/workbench/index.vue

@@ -90,7 +90,7 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/purchaseIn/workbench";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/sellOut/sellAfterApply/ShowDataTableColumns.js

@@ -2,56 +2,49 @@ export default [
   {
     prop: "returnCode",
     label: "售后申请单号",
+    span:6
   },
   {
     prop: "status",
     label: "售后申请单状态",
     _slot_: "status",
+    span:6
   },
   {
     prop: "outCode",
-    label: "发货申请单编号"
+    label: "发货申请单编号",
+    span:6
   },
 
-  // {
-  //   prop: "order_type",
-  //   label: "订单类别",
-  //   _slot_: "order_type",
-  // },
+  {
+    prop: "order_type",
+    label: "订单类别",
+    _slot_: "order_type",
+    span:6
+  },
 
   {
     prop: "orderCode",
     label: "销售订单编号",
+    span:6
   },
   {
     prop: "apply_name",
-    label: "申请人"
-  },
-  {
-    prop: "class_cat",
-    label: "商品分类",
-  },
-
-  {
-    prop: "good_code",
-    label: "商品编码",
-  },
-
-  {
-    prop: "good_name",
-    label: "商品名称",
+    label: "申请人",
+    span:6
   },
 
  
   {
     prop: "total_num",
-    label: "总发货数量",
+    label: "发货总数量",
+    span:6
   },
 
-  {
-    prop: "sale_price",
-    label: "销售单价",
-  },
+  // {
+  //   prop: "sale_price",
+  //   label: "销售单价",
+  // },
   // {
   //   prop: "origin_price",
   //   label: "采购单价",
@@ -61,18 +54,19 @@ export default [
   //   prop: "sale_price",
   //   label: "商品单价",
   // },
-  {
-    prop: "total_price",
-    label: "发货申请单总价",
-  },
+  // {
+  //   prop: "total_price",
+  //   label: "发货申请单总价",
+  // },
 
-  {
-    prop: "updatetime",
-    label: "更新时间",
-  },
+  // {
+  //   prop: "updatetime",
+  //   label: "更新时间",
+  // },
   {
     prop: "addtime",
     label: "创建时间",
+    span:6
   },
 
 

src/views/sellOut/sellAfterApply/index.vue

@@ -226,7 +226,7 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/sellOut/sellAfterApply";
 import addEdit from "./components/addEdit.vue";
 import columns from "./columns";

src/views/sellOut/sellOutOrder/options.js

@@ -1,32 +0,0 @@
-export default {
-    serviceOption: [//假数据
-        {
-          value: "选项1",
-          label: "待业务审核",
-        },
-        {
-          value: "选项2",
-          label: "待供应商反馈",
-        },
-        {
-          value: "选项3",
-          label: "待采购反馈",
-        },
-        {
-          value: "选项4",
-          label: "待采购审核",
-        },
-        {
-          value: "选项5",
-          label: "处理已结束",
-        },
-        {
-          value: "d",
-          label: "业务已驳回",
-        },
-        {
-          value: "d",
-          label: "采购已驳回",
-        },
-      ],
-}

src/views/sellOut/zixunOrder/index.vue

@@ -191,7 +191,7 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/sellOut/zixunOrder";
 import { listCol } from "./columns";
 import { mapGetters } from "vuex";

src/views/serviceParam/exclusive/index.vue

@@ -213,7 +213,7 @@
 <script>
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/serviceParam/exclusive";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/serviceParam/orderuse/index.vue

@@ -208,7 +208,7 @@
 <script>
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/serviceParam/orderuse";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/serviceParam/parameter/index.vue

@@ -208,7 +208,7 @@
 <script>
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/serviceParam/parameter";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/serviceParam/supplier/index.vue

@@ -272,7 +272,7 @@
 </template>
 <script>
 import asyncRequest from "@/apis/service/serviceParam/supplier";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/serviceParam/terrace/index.vue

@@ -208,7 +208,7 @@
 <script>
 import addEdit from "./addEdit";
 import asyncRequest from "@/apis/service/serviceParam/terrace";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import roleLevel from "@/assets/js/roleLevel";
 import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";

src/views/serviceParam/unusualReason/index.vue

@@ -182,7 +182,7 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/serviceParam/unusualReason";
 import addEdit from "./addEdit";
 import { mapGetters } from "vuex";

src/views/stock/allot/index.vue

@@ -202,7 +202,7 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/stock/allot";
 import columns from "./columns"; //表格列参数
 import addEdit from "./addEdit";

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

@@ -121,7 +121,7 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/stock/productWeido";
 import { mapGetters } from "vuex";
 import columns from "./columns";

src/views/stock/stockWarning/index.vue

@@ -171,7 +171,7 @@
    <script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
-import statusList from "@/assets/js/statusList";
+import {statusList} from "@/assets/js/statusList";
 import asyncRequest from "@/apis/service/stock/stockWarning";
 import colums from "./colums";
 import addEdit from "./addEdit";