build

src/apis/service/interest/dataShare/index.js

@@ -14,7 +14,7 @@ export default {
   // 修改状态
   status: (data, params) => http(api + 'statusDataShare', data, 'post', params),
   // 获取全部账户列表
-  accountall: (data, params) => http(api + 'userall', data, 'post', params),
+  accountall: (data, params) => http(api + 'userCompanyBasicList', data, 'post', params),
   // 获取全部用户组
   groupall: (data, params) => http(api + 'getDataGroupListAll', data, 'post', params),
   // 功能权限列表

src/views/goodStore/goodsOnline/columns.js

@@ -4,6 +4,13 @@ const options1 = [
   { id: '0', name: '否' },
   { id: '1', name: '是' }
 ]
+
+export const options01 = [
+  { id: '0', name: '未设置' },
+  { id: '1', name: '合规' },
+  { id: '2', name: '不合规' }
+]
+
 // 专属类型
 const options2 = [
   { id: '0', name: '非泰康' },

src/views/goodStore/goodsOnline/index.vue

@@ -178,8 +178,9 @@
                   parmValue.page = 1;
                   searchList();
                 ">
-                <el-option value="0" label="不合规" />
+                <el-option value="0" label="未设置" />
                 <el-option value="1" label="合规" />
+                <el-option value="2" label="不合规" />
               </el-select>
             </el-col>
 
@@ -260,7 +261,7 @@
           :size="tablebtnSize"
           :type="scope.row.is_compliance == '0' ? 'warning' : ''"
           v-text="
-            (options1.find((item) => item.id == scope.row.is_compliance) || {}).name || '--'
+            (options01.find((item) => item.id == scope.row.is_compliance) || {}).name || '--'
           "
         ></el-tag>
       </template>
@@ -428,7 +429,7 @@ import mixinPage from "@/mixins/elPaginationHandle";
 import { mapGetters } from "vuex";
 import urlConfig from "@/apis/url-config";
 import resToken from "@/mixins/resToken";
-import { listCol, options1, options8 } from "./columns";
+import { listCol, options1, options8, options01 } from "./columns";
 import companyHelper from "@/mixins/companyHelper";
 import { isStockOptions } from "@/assets/js/statusList";
 import CompianceModal from "./components/compiance-modal.vue"
@@ -457,6 +458,7 @@ export default {
     };
     return {
       isStockOptions,
+      options01,
       dialogFormVisible: false,
       donline_formStOps: [],
       donline_form: {

src/views/interest/dataShare/addEdit.vue

@@ -339,9 +339,12 @@ export default {
       }
     },
     async getAllActive() {
-      const res = await asyncRequest.accountall(this.dataForm)
+      const res = await asyncRequest.accountall({
+        ...this.dataForm,
+        level: '2'
+      })
       if (res && res.code === 0 && res.data) {
-        this.activeOptions = res.data
+        this.activeOptions = res.data.list
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout()
       } else {

src/views/sellOut/sellReturn/components/ShowDataTableColumns.js

@@ -116,7 +116,12 @@ export const setWorkOrderColumns = [
   {
     prop: 'return_num',
     label: '退货数量',
-    span: 4
+    span: 5
+  },
+  {
+    prop: 'currentWorkOrder',
+    label: '已设置工单数量',
+    span: 5
   }
 ]
 

src/views/sellOut/sellReturn/components/child-list.vue

@@ -173,9 +173,11 @@ export default {
       const { code, data } = await asyncRequest.reorderRool({returnCode: this.sitem.returnCode});
       console.log(this.sitem)
       if (code === 0) {
-        const { list ,count} = data;
+        const { list ,count, is_sale_return_child_count} = data;
         this.tableData = list;
         this.pageInfo.total = count 
+        this.$emit("getWorkOrderCount", count)
+        this.$emit("getCurrentWorkOrderCount", is_sale_return_child_count)
         /* 从发货信息中拿到第一条数据 **/
         this.$emit('getSendInfoFirst', list[0])
       } else if (code >= 100 && code <= 104) {

src/views/sellOut/sellReturn/components/set-work-order.vue

@@ -5,7 +5,7 @@
         <div>
           <show-data-table
             style="margin: 0px; padding: 0"
-            :sitem="{...sitem,...outItem}"
+            :sitem="{...sitem,...outItem,...{currentWorkOrder}}"
             :columns="setWorkOrderColumns"
           />
 
@@ -98,7 +98,7 @@
       </el-form>
     </template>
 
-    <el-button class="fr" style="margin:10px 0px" size="mini" type="primary" :loading="subLoading" @click="onSetOrderReturnChild">保存</el-button>
+    <el-button class="fr" style="margin:10px 0px" size="mini" type="primary" :loading="subLoading" @click="onSetOrderReturnChild">{{ confirmText }}</el-button>
   </div>
 </template>
 
@@ -111,7 +111,7 @@ import { setWorkOrderColumns } from './ShowDataTableColumns'
 export default {
   name: 'WorkOrder',
   mixins: [resToken, companyHelper],
-  props: ['sitem', 'outItem'],
+  props: ['sitem', 'outItem', 'workOrderCount', 'currentWorkOrder'],
   data: () => ({
     list: [],
     companyNo: '',
@@ -124,6 +124,10 @@ export default {
     }
   }),
   computed: {
+    confirmText() {
+      console.log(Number(this.workOrderCount), Number(this.currentWorkOrder))
+      return Number(this.workOrderCount) === Number(this.currentWorkOrder) ? '保存' : '保存当前设置'
+    },
     state() {
       const { order_type, is_addr } = this.sitem || {}
       return ({

src/views/sellOut/sellReturn/detail.vue

@@ -147,7 +147,7 @@
 
 
             <el-collapse-item title="申请退货的发货单" name="8" v-if="sitem && sitem.is_addr === '1'">
-              <child-list ref="childListRef" :sitem="sitem" @getSendInfoFirst="onGetSendInfoFirst"/>
+              <child-list ref="childListRef" :sitem="sitem" @getCurrentWorkOrderCount="_currentOrderWork => currentWorkOrder = _currentOrderWork" @getWorkOrderCount="_workOrderCount => workOrderCount = _workOrderCount" @getSendInfoFirst="onGetSendInfoFirst"/>
             </el-collapse-item>
 
             <el-collapse-item title="待业务审核" name="3" v-if="isHasPermission({status:'1', process:'1'})">
@@ -185,8 +185,14 @@
               />
             </el-collapse-item>
 
-            <el-collapse-item title="待设置工单" name="7"  v-if="isHasPermission({status:'11',process:'11'})" >
-              <set-work-order :sitem="sitem" :outItem="outItem" @reload="handleReload" />
+            <el-collapse-item title="待设置工单" name="7" v-if="isHasPermission({status:'11',process:'11'})">
+              <set-work-order 
+                :sitem="sitem" 
+                :currentWorkOrder="currentWorkOrder" 
+                :workOrderCount="workOrderCount" 
+                :outItem="outItem"
+                 @reload="handleReload" 
+              />
             </el-collapse-item>
 
             <el-collapse-item title="商品信息" name="2">
@@ -264,6 +270,8 @@ export default {
     return {
       activeTabs: "1",
       showColumns: showColumns,
+      workOrderCount:"",
+      currentWorkOrder:"",
       outItem: {},
       statusOptions: [
         { value: "1", label: "待业务审批" },
@@ -381,9 +389,6 @@ export default {
     /*  重新获取最第一条退货单 **/
     this.$refs.childListRef && this.$refs.childListRef.searchList()
    },
-    // async requsetReorderRool(returnCode){
-    //   let res = await asyncRequest.reorderRool({returnCode});
-    // },
     //供应商确认
     async handleSupplierConfirm(e){
       if (!this.loading) {