删除部分冗余功能

.env.test

@@ -1,5 +1,5 @@
 NODE_ENV='production'
 VUE_APP_BUILD_TYPE='test'
-VUE_APP_SERVER_URL='http://dkmp.hegii.com:1098/api/'
-VUE_APP_WEBSOCKET_URL='ws://dkmp.hegii.com:1098/websocket/'
-VUE_APP_FILE_URL='http://dkmp.hegii.com:1098/download/'
+VUE_APP_SERVER_URL='http://s.dev01.dkiboss.com:8201/api/'
+VUE_APP_WEBSOCKET_URL='ws://s.dev01.dkiboss.com:8201/websocket/'
+VUE_APP_FILE_URL='http://s.dev01.dkiboss.com:8201/download/'

src/view/customerManage/customerManage/customerManage.vue

@@ -203,20 +203,20 @@ export default {
         { title: '经销商编码', key: 'customercode', align: 'center', sortable: true, minWidth: 160 },
         { title: '东科账套', key: 'dongkeaccountcode', align: 'center', sortable: true, minWidth: 180 },
         { title: 'iBOSS用户编码', key: 'uniqueCode', align: 'center', sortable: true, minWidth: 160 },
-        {
-          title: '报表标识',
-          key: 'reportflag',
-          align: 'center',
-          minWidth: 120,
-          render: (h, params) => {
-            return h('div', [
-              h('i-switch', {
-                props: { size: 'large', type: 'primary', value: params.row.reportflag === 1, disabled: true },
-                scopedSlots: { open: () => h('span', '是'), close: () => h('span', '否') },
-              })
-            ])
-          }
-        },
+        // {
+        //   title: '报表标识',
+        //   key: 'reportflag',
+        //   align: 'center',
+        //   minWidth: 120,
+        //   render: (h, params) => {
+        //     return h('div', [
+        //       h('i-switch', {
+        //         props: { size: 'large', type: 'primary', value: params.row.reportflag === 1, disabled: true },
+        //         scopedSlots: { open: () => h('span', '是'), close: () => h('span', '否') },
+        //       })
+        //     ])
+        //   }
+        // },
         {
           title: '基础数据同步标识',
           key: 'baseinfoflag',

src/view/orderManage/orderDetailManage/pullOrderDetailManage.vue

@@ -146,10 +146,10 @@
           { title: '经销商编码', key: 'customerCode', align: 'center', sortable: true, minWidth: 140 },
           { title: '数据类型', key: 'typeName', align: 'center', sortable: true, minWidth: 120 },
           { title: '状态',
-key: 'status',
-align: 'center',
-sortable: true,
-minWidth: 100,
+            key: 'status',
+            align: 'center',
+            sortable: true,
+            minWidth: 100,
             render: (h, params) => {
               return h('div',
                 [

src/view/synchManage/synchCrmManage/syncCrmManage.vue

@@ -5,7 +5,7 @@
       <div slot="title">
         <i-button icon="md-search" type="primary" shape="circle" @click="selectData()" v-access="'004004001'">查询</i-button>
         <i-button icon="md-refresh" type="primary" shape="circle" @click="clearForm" style="margin-left: 7px;">清空</i-button>
-        <i-button icon="md-checkmark" type="primary" shape="circle" @click="checkCode()" style="margin-left: 7px;" v-access="'004004002'">批量审核</i-button>
+<!--        <i-button icon="md-checkmark" type="primary" shape="circle" @click="checkCode()" style="margin-left: 7px;" v-access="'004004002'">批量审核</i-button>-->
       </div>
       <!--表单-->
       <i-form inline @submit.native.prevent :label-width="80"  ref="selectForm" :model="selectForm" :rules="selectRules" style="position: relative">
@@ -15,32 +15,6 @@
         <Form-item prop="onlycode" label="唯一编码">
           <i-input type="text" v-model="selectForm.onlycode" placeholder="请输入唯一编码" clearable></i-input>
         </Form-item>
-        <Form-item class="dx" prop="status" label="状态">
-          <Select v-model="selectForm.status" placeholder="全部" clearable filterable>
-            <Option v-for="(item,index) in statusList" :value="item.status" :key="index">{{item.statusname}}</Option>
-          </Select>
-        </Form-item>
-        <Form-item class="dx" prop="dostatus" label="处理状态">
-          <Select v-model="selectForm.dostatus" placeholder="全部" clearable filterable>
-            <Option v-for="(item,index) in doStatusList" :value="item.status" :key="index">{{item.statusname}}</Option>
-          </Select>
-        </Form-item>
-        <Form-item class="dx" prop="typename" label="类型">
-          <Select v-model="selectForm.typename" placeholder="全部" clearable filterable>
-            <Option v-for="(item,index) in typeList" :value="item.type" :key="index">{{item.typename}}</Option>
-          </Select>
-        </Form-item>
-        <Form-item prop="checkflag" label="审核标识">
-          <Select class="dx" v-model="selectForm.checkflag" placeholder="全部" clearable filterable >
-            <Option :value="0" >未审核</Option>
-            <Option :value="1" >已审核</Option>
-          </Select>
-        </Form-item>
-        <Form-item class="xxxx" prop="goodsstatusname" label="产品状态">
-          <Select  v-model="selectStatusList" multiple placeholder="全部" clearable filterable>
-            <Option v-for="(item,index) in goodsstatusnameList" :value="item.goodsstatus"  :key="index">{{item.goodsstatusname}}</Option>
-          </Select>
-        </Form-item>
         <Form-item label="" style="width: 0px;height: 0px; position: absolute;right: 120px;bottom: 20px">
           <vxe-toolbar style="margin: 0;height: 0;height: max-content;background: #f5f7f900;" ref="tableToolbar" custom>
           </vxe-toolbar>
@@ -83,45 +57,6 @@
             <vxe-column field="goodsname" title="商品名称" align="center" width="150px" min-width="70px"></vxe-column>
             <vxe-column field="onlycode" title="唯一编码" align="center" width="150px" min-width="70px"></vxe-column>
             <vxe-column field="code" title="商品编码" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="checkflagname" title="审核标识" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="typename" title="类型" align="center" width="150px" min-width="44px"></vxe-column>
-            <vxe-column field="status" title="状态" align="center" width="150px" min-width="44px">
-              <template #default="{ row }">
-                <Tag :color=" row.status > 0 ? 'blue' : 'red'">
-                  {{ row.status == 1?'成功':'失败'}}
-                </Tag >
-                <Tag :color=" row.dostatus > 0 ? 'green' : 'orange'">
-                  {{ row.dostatus == 1?'已处理':'未处理'}}
-                </Tag >
-              </template>
-            </vxe-column>
-            <vxe-column field="goodsstatusname" title="产品状态" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="productorientationname" title="产品定位" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="unitname" title="计量单位" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="hggrossWeight" title="毛重" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="netWeight" title="净重" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="productSizeBefore" title="产品尺寸-包装前" align="center" width="150px" min-width="115px"></vxe-column>
-            <vxe-column field="productSizeAfter" title="产品尺寸-包装后" align="center" width="150px" min-width="115px"></vxe-column>
-            <vxe-column field="seriesname" title="商品系列" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="formulatype" title="面积公式" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="gradename" title="商品等级" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="volume" title="体积" align="center" width="150px" min-width="44px"></vxe-column>
-            <vxe-column field="kindname" title="商品种类" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="specificationname" title="商品规格" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="circulatetypename" title="流通方式" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="iscountflagname" title="计量标识" align="center" width="150px" min-width="65px"></vxe-column>
-            <vxe-column field="customflagname" title="定制品" align="center" width="150px" min-width="65px"></vxe-column>
-            <vxe-column field="specificationeditflagname" title="规格是否修改" align="center" width="150px" min-width="95px"></vxe-column>
-            <vxe-column field="installationflagname" title="需要安装标识" align="center" width="150px" min-width="95px"></vxe-column>
-            <vxe-column field="componentflagname" title="配件标识" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="message" title="CRM抓取情况说明" align="center" width="150px" min-width="120px"></vxe-column>
-            <vxe-column field="remark" title="中台建档情况说明" align="center" width="150px" min-width="120px"></vxe-column>
-            <vxe-column field="crmupdated" title="更新时间" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="dosomething" title="操作" width="100" align="center" min-width="150px" fixed="right">
-              <template #default="{ row }">
-                <vxe-button size="mini" content="编辑" :disabled="!row.onlycode" @click="editJump(row)"></vxe-button>
-              </template>
-            </vxe-column>
           </vxe-table>
           <Page :total="this.pageInfo.total" show-total show-elevator show-sizer :page-size-opts="[10, 20, 50, 100, 200]"
                 @on-change="changeCurrentPage" @on-page-size-change="changePageSize" style="margin-top: 5px"
@@ -214,12 +149,26 @@
         //table列
         tableHeight:400,
         tableHeightR:400,
-        tableWidthR:500,
-        tableWidthL:250,
+        tableWidthR:400,
+        tableWidthL:450,
         tableDataTime: [],
         columnsTime: [
           { title: '序号', type: 'index', width: 65, align: 'center' },
           { title: '日期', key: 'createTime', align: 'center', sortable: true, minWidth: 120 },
+          { title: '状态',
+            key: 'status',
+            align: 'center',
+            sortable: true,
+            minWidth: 100,
+            render: (h, params) => {
+              return h('div',
+                [
+                  h('Tag', {
+                    props: { color:params.row.status == 1 ? 'blue' : 'red' },
+                  }, params.row.status == 1 ? '成功' : '失败'),
+                ])
+            }
+          },
         ],
         tableData: [],
         columns: [

src/view/synchManage/synchStatusManage/synchStatusManage.vue

@@ -8,26 +8,12 @@
       </div>
       <!--表单-->
       <i-form inline @submit.native.prevent :label-width="80"  ref="selectForm" :model="selectForm" :rules="selectRules" style="position: relative">
-        <Form-item prop="goodsname" label="商品名称">
-          <i-input type="text" v-model.trim="selectForm.goodsname" placeholder="请输入商品名称" clearable></i-input>
-        </Form-item>
-        <Form-item prop="code" label="商品编码">
-          <i-input type="text" v-model.trim="selectForm.code" placeholder="请输入商品编码" clearable></i-input>
-        </Form-item>
-        <Form-item prop="onlycode" label="唯一编码">
-          <i-input type="text" v-model.trim="selectForm.onlycode" placeholder="请输入唯一编码" clearable></i-input>
-        </Form-item>
         <Form-item prop="dongkeaccountcode" label="东科账套">
           <i-input type="text" v-model.trim="selectForm.dongkeaccountcode" placeholder="请输入东科账套" clearable></i-input>
         </Form-item>
         <Form-item prop="customername" label="经销商名称">
           <i-input type="text" v-model.trim="selectForm.customername" placeholder="请输入经销商名称" clearable></i-input>
         </Form-item>
-        <Form-item prop="status" label="状态">
-          <Select v-model="selectForm.status" placeholder="全部状态" clearable filterable>
-            <Option v-for="item in statusList":value="item.status">{{item.statusname}}</Option>
-          </Select>
-        </Form-item>
         <Form-item label="" style="width: 0px;height: 0px; position: absolute;right: 120px;bottom: 20px">
           <vxe-toolbar style="margin: 0;height: 0;height: max-content;background: #f5f7f900;" ref="tableToolbar" custom>
           </vxe-toolbar>
@@ -64,19 +50,14 @@
             <vxe-column field="customercode" title="经销商编码" align="center" width="150px" min-width="80px"></vxe-column>
             <vxe-column field="dongkeaccountcode" title="东科账套" align="center" width="150px" min-width="70px"></vxe-column>
             <vxe-column field="customername" title="经销商名称" align="center" width="150px" min-width="80px"></vxe-column>
-            <vxe-column field="goodsname" title="商品名称" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="code" title="商品编码" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="onlycode" title="唯一编码" align="center" width="150px" min-width="70px"></vxe-column>
-            <vxe-column field="version" title="版本" align="center" width="150px" min-width="44px"></vxe-column>
             <vxe-column field="status" title="状态" align="center" width="150px" min-width="44px">
               <template #default="{ row }">
-                <Tag :color=" row.status==0? 'blue' : 'red'">
-                  {{ row.status == 0?'已同步':'未同步'}}
+                <Tag :color=" row.status==1? 'blue' : 'red'">
+                  {{ row.status == 1?'成功':'失败'}}
                 </Tag >
               </template>
             </vxe-column>
             <vxe-column field="createdate" title="日期" align="center" width="150px" min-width="44px"></vxe-column>
-            <vxe-column field="createuseridname" title="操作人" align="center" width="150px" min-width="65px"></vxe-column>
             <vxe-column field="message" title="说明" align="center" width="150px" min-width="70px"></vxe-column>
           </vxe-table>
           <Page :total="this.pageInfo.total" show-total show-elevator show-sizer :page-size-opts="[10, 20, 50, 100, 200]"