Merge branch 'master' of http://116.204.71.86:3000/UDI/udiwms-vue-frame

src/views/inout/DialogSelectInvProduct.vue

@@ -65,6 +65,8 @@ import {
 } from "@/api/inventory/invPorduct";
 import {addDetail} from "@/api/inout/receiveOrder";
 import {addBizProduct} from "@/api/inout/orderDetailCode";
+import {getInvPreInProduct} from "@/api/inventory/invPreInSearch";
+import {getInvPreProduct} from "@/api/inventory/invPreProduct";
 
 
 export default {
@@ -162,7 +164,38 @@ export default {
     },
 
     getList() {
+      debugger
       this.loading = true;
+      //寄售
+      if(this.invQueryData.advanceType==3){
+        getInvPreProduct(this.filterQuery)
+          .then((response) => {
+            this.showSup = response.data.showSup;
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+      //预验收
+      }else if(this.invQueryData.advanceType==2){
+        getInvPreInProduct(this.filterQuery)
+          .then((response) => {
+            this.showSup = response.data.showSup;
+            this.loading = false;
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          })
+          .catch(() => {
+            this.loading = false;
+            this.list = [];
+            this.total = 0;
+          });
+
+      }else{
         getInvProduct(this.filterQuery)
           .then((response) => {
             this.showSup = response.data.showSup;
@@ -175,6 +208,7 @@ export default {
             this.list = [];
             this.total = 0;
           });
+      }
     },
     hideSearch() {
       this.showSearch = !this.showSearch;

src/views/inout/receive/DialogNewReceive.vue

@@ -59,7 +59,7 @@
           </el-col>
           <el-col :span="11">
             <el-form-item class="query-form-item" prop="targetInvCode" label="往来信息:">
-              <el-select v-model="formData.targetInvCode"  placeholder="请选择往来信息"
+              <el-select v-model="formData.targetInvCode"  placeholder="请选择往来信息" @change="getTargerType"
                          clearable="true"
                          style="width: 100%"
               >
@@ -277,6 +277,7 @@ export default {
     findFromInv() {
       let cQuery = {
         locInvCode: this.formData.invCode,
+        type:1,
       };
       findByFrom(cQuery)
         .then((response) => {
@@ -301,7 +302,10 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-
+    getTargerType(){
+      this.formData.advanceType= this.fromOptions.find(item => item.code == this.formData.targetInvCode).advanceType
+      console.log(this.formData)
+    },
     saveOrder(status) {
       this.code = "";
       this.$refs.multipleTable.setCurrentRow();

src/views/inout/receive/receiveAdd.vue

@@ -22,7 +22,14 @@
           </el-col>
           <el-col :span="8">
           <el-form-item label="往来信息:">
-            <el-input v-model="filterQuery.corpName" style="width: 90%"  placeholder="请输入往来信息" clearable></el-input>
+            <el-select v-model="filterQuery.corpName"  placeholder="请输入往来信息" style="width: 100%;">
+              <el-option
+                v-for="item in corpList"
+                :key="item.code"
+                :label="item.name"
+                :value="item.code">
+              </el-option>
+            </el-select>
           </el-form-item>
           </el-col>
 <!--          <el-col :span="6">-->
@@ -147,7 +154,7 @@ import {selectIp} from "@/api/param/systemParamConfig";
 import thrOrderNew from "./DialogNewReceive";
 import {getOrderDetail, getReceiveOrder} from "@/api/inout/receiveOrder";
 import {getBusChange} from "@/api/basic/busTypeChange";
-import {findInvByUser} from "@/api/system/invSubWarehouse";
+import {filterSubAll, findInvByUser} from "@/api/system/invSubWarehouse";
 
 export default {
   data() {
@@ -178,6 +185,7 @@ export default {
         4: "已拒绝"
       },
       idQuery: {},
+      corpList: [],
       total: 0,
       thirdSys: [],
       thirdSysDetail: null,
@@ -373,6 +381,15 @@ export default {
         .catch(() => {
         });
     },
+    finCorpList(){
+      filterSubAll({})
+        .then((response) => {
+          this.corpList = response.data || [];
+        })
+        .catch(() => {
+        });
+    },
+
   },
   components: {
     thrOrderNew,
@@ -382,6 +399,7 @@ export default {
   created() {
     this.finCurInv();
     this.getBusType();
+    this.finCorpList();
   },
 };
 </script>

src/views/sync/SysUdimsData.vue

@@ -12,18 +12,13 @@
           <el-form-item class="query-form-item">
             <el-select v-model="filterQuery.status" placeholder="处理状态">
               <el-option label="全部" value=""></el-option>
-              <el-option label="等待处理" value="0"></el-option>
+              <el-option label="异常" value="1"></el-option>
-              <el-option label="已处理" value="1"></el-option>
+              <el-option label="已处理" value="2"></el-option>
-              <el-option label="异常" value="2"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item class="query-form-item">
-            <el-date-picker
+            <el-date-picker v-model="filterQuery.syncTime" type="datetime" format="yyyy-MM-dd HH:mm:ss"
-              v-model="filterQuery.syncTime"
+              value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择同步时间">
-              type="datetime"
-              format="yyyy-MM-dd HH:mm:ss"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="请选择同步时间">
             </el-date-picker>
           </el-form-item>
           <el-form-item>
@@ -31,114 +26,56 @@
               <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
               <el-button type="primary" icon="search" @click="getList">查询</el-button>
               <el-button type="primary" icon="search" @click="createScheduleDialog(1)"
-                         :disabled="!configParms.orderScanFinish&& !configParms.orderUnReceive&& !configParms.orderUnCheck">
+                v-if="configParms.orderScanFinish==1 || configParms.orderUnReceive==1 || configParms.orderUnCheck==1">
                 同步单据
               </el-button>
-              <el-button type="primary" icon="search" @click="createScheduleDialog(2)"
+           <!--   <el-button type="primary" icon="search" @click="createScheduleDialog(2)"
-                         :disabled="!configParms.typeBus&& !configParms.typeScan&& !configParms.typeThird">
+                v-if="configParms.typeBus==1||configParms.typeScan==1||configParms.typeThird==1">
                 同步单据类型
               </el-button>
-              <el-button type="primary" icon="search" @click="createScheduleDialog(3)"
+              <el-button type="primary" icon="search" @click="createScheduleDialog(3)" v-if="configParms.basicProducts==1||configParms.basicCorp==1||configParms.basicInv==1||configParms.basicThirdProducts==1||
-                         :disabled="!configParms.basicProducts&& !configParms.basicCorp&&
+              configParms.basicThirdCorp==1||configParms.basicThirdInv==1||configParms.basicThirdBusOrder==1||configParms.sysUser==1">同步基础信息
-                                        !configParms.basicInv&&!configParms.basicThirdProducts&& !configParms.basicThirdCorp&& !configParms.basicThirdInv
+              </el-button> -->
-                                && !configParms.basicThirdBusOrder&& !configParms.sysUser">同步基础信息
-              </el-button>
             </el-button-group>
           </el-form-item>
         </el-row>
       </el-form>
 
-      <el-table
+      <el-table v-loading="loading" :data="list" style="width: 100%">
-        v-loading="loading"
-        :data="list"
-        style="width: 100%"
-      >
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column
+        <el-table-column label="任务ID" prop="id" width="140" show-overflow-tooltip></el-table-column>
-          label="任务ID"
-          prop="id"
-          width="140"
-          show-overflow-tooltip
-        ></el-table-column>
 
-        <el-table-column
+        <el-table-column label="任务类型" prop="type" width="140" show-overflow-tooltip>
-          label="任务类型"
-          prop="idDatas"
-          width="140"
-          show-overflow-tooltip
-        >
           <template slot-scope="scope">
-            <span>{{ type[scope.row.idDatas] }}</span>
+            <span>{{ scope.row.type }}</span>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="状态" prop="status" width="140" show-overflow-tooltip>
-          label="状态"
-          prop="status"
-          width="140"
-          show-overflow-tooltip
-        >
           <template slot-scope="scope">
-            <el-tag
+            <el-tag :type="statusFilterType(scope.row.status)">{{ status[scope.row.status] }}
-              :type="statusFilterType(scope.row.status)"
+            </el-tag>
-            >{{ status[scope.row.status] }}
-            </el-tag
-            >
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="开始时间" width="180" prop="startTime" show-overflow-tooltip></el-table-column>
-          label="开始时间"
+        <el-table-column label="结束时间" width="180" prop="endTime" show-overflow-tooltip></el-table-column>
-          width="180"
-          prop="startTime"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          label="结束时间"
-          width="180"
-          prop="endTime"
-          show-overflow-tooltip
-        ></el-table-column>
 
-        <el-table-column
+        <el-table-column label="同步信息" prop="remark" show-overflow-tooltip></el-table-column>
-          label="同步信息"
-          prop="remark"
-          show-overflow-tooltip
-        ></el-table-column>
 
         <el-table-column label="操作" fixed="right" width="160">
           <template slot-scope="scope">
-            <el-button
+            <el-button type="text" size="small" @click.native.stop="detailDialog(scope.row.id)">详情
-              type="text"
+            </el-button>
-              size="small"
+            <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row.id)">删除
-              @click.native.stop="detailDialog(scope.row.id)"
+            </el-button>
-            >详情
-            </el-button
-            >
-            <el-button
-              type="text"
-              size="small"
-              @click.native.stop="deleteDialog(scope.row.id)"
-            >删除
-            </el-button
-            >
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
+      <el-pagination :page-size="filterQuery.limit" @current-change="handleCurrentChange" layout="prev, pager, next"
-        :page-size="filterQuery.limit"
+        :total="total" :current-page="filterQuery.page"></el-pagination>
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
-        :total="total"
-        :current-page="filterQuery.page"
-      ></el-pagination>
     </el-card>
 
-    <el-dialog
+    <el-dialog title="同步信息" width="25%" :close-on-click-modal="false" :close-on-press-escape="false"
-      title="同步信息"
+      :visible.sync="syncVisible">
-      width="25%"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :visible.sync="syncVisible"
-    >
       <span v-text="syncInfo" style="white-space:pre-line;" class="syncInfo"></span>
     </el-dialog>
 
@@ -146,7 +83,13 @@
 </template>
 
 <script>
-import {filterLog, deleteLog, createSchedule, findConfig, updateConfig} from "@/api/sync/spsSyncStatus";
+  import {
+    filterLog,
+    deleteLog,
+    createSchedule,
+    findConfig,
+    updateConfig
+  } from "@/api/sync/spsSyncStatus";
   import store from "@/store";
 
   export default {
@@ -167,16 +110,9 @@ export default {
         total: 0,
         currentRow: null,
         editQuery: null,
-      type: {
-        "AutoUploadOrder": "已完成单据",
-        "AutoUploadBusType": "单据类型",
-        "AutoUploadAllData": "基础信息",
-        "AutoDownloadDiProducts": "国家库DI数据"
-      },
         status: {
-        0: "等待处理",
+          1: "处理异常",
-        1: "处理完成",
+          2: "处理完成",
-        2: "处理异常",
         },
 
         configQuery: {
@@ -278,13 +214,11 @@ export default {
         if (val) {
           this.getList();
         }
-    }
+      },
-    ,
       handleCurrentChange(val) {
         this.filterQuery.page = val;
         this.getList();
-    }
+      },
-    ,
 
 
       createScheduleDialog(type) {
@@ -297,8 +231,7 @@ export default {
             .then(() => {
               this.createSchedule(type);
             })
-          .catch(() => {
+            .catch(() => {});
-          });
         } else {
           this.createSchedule(type);
         }
@@ -351,10 +284,8 @@ export default {
                 this.loading = false;
               });
           })
-        .catch(() => {
+          .catch(() => {});
-        });
+      },
-    }
-    ,
       handleChange(response, files, fileList) {
         console.log(response);
         if (response.code != 20000) {
@@ -365,17 +296,14 @@ export default {
           this.$message.success(response.data);
           this.getList();
         }
-    }
+      },
-    ,
       statusFilterType(status) {
         const statusMap = {
-        0: "warning",
+          2: "success",
-        1: "success",
+          1: "danger",
-        2: "danger",
         };
         return statusMap[status];
-    }
+      },
-    ,
       getSyncConfig() {
         findConfig()
           .then((response) => {
@@ -383,8 +311,7 @@ export default {
               this.configParms = response.data;
             }
           })
-        .catch(() => {
+          .catch(() => {});
-        });
       },
       detailDialog(id) {
         this.syncVisible = true;
@@ -396,8 +323,7 @@ export default {
       }
     },
 
-  mounted() {
+    mounted() {},
-  },
     components: {},
     created() {
       this.headers = {

src/views/sync/SysUdimsDownloadData.vue

@@ -12,9 +12,8 @@
           <el-form-item class="query-form-item">
             <el-select v-model="filterQuery.status" placeholder="处理状态">
               <el-option label="全部" value=""></el-option>
-              <el-option label="等待处理" value="0"></el-option>
+              <el-option label="异常" value="1"></el-option>
-              <el-option label="已处理" value="1"></el-option>
+              <el-option label="已处理" value="2"></el-option>
-              <el-option label="异常" value="2"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -23,14 +22,14 @@
               <el-button type="primary" icon="search" @click="getList">查询</el-button>
             </el-button-group>
           </el-form-item>
-          <el-form-item>
+     <!--     <el-form-item>
             <el-button-group style="display:flex;">
               <el-button type="primary" icon="search" @click="downloadNow(1)">立即下载基础信息</el-button>
               <el-button type="primary" icon="search" @click="downloadNow(2)">立即下载单据类型</el-button>
               <el-button type="primary" icon="search" @click="downloadNow(3)">立即下载扫码单据</el-button>
               <el-button type="primary" icon="search" @click="downloadNow(4)">立即下载国家库信息</el-button>
             </el-button-group>
-          </el-form-item>
+          </el-form-item> -->
         </el-row>
       </el-form>
 
@@ -49,12 +48,12 @@
 
         <el-table-column
           label="任务类型"
-          prop="idDatas"
+          prop="type"
           width="140"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <span>{{ type[scope.row.idDatas] }}</span>
+            <span>{{scope.row.type }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -156,16 +155,9 @@ export default {
       total: 0,
       currentRow: null,
       editQuery: null,
-      type: {
-        "AutoDownloadOrder": "已完成单据",
-        "AutoDownloadBusType": "单据类型",
-        "AutoDownloadAllData": "基础信息",
-        "AutoDownloadDiProducts": "国家库DI数据"
-      },
       status: {
-        0: "等待处理",
+        1: "处理异常",
-        1: "处理完成",
+        2: "处理完成",
-        2: "处理异常",
       },
 
       configQuery: {
@@ -204,7 +196,7 @@ export default {
       });
       this.filterQuery = {
         taskId: null,
-        status: "1",
+        status: "",
         page: 1,
         limit: 20,
       };
@@ -322,9 +314,8 @@ export default {
     },
     statusFilterType(status) {
       const statusMap = {
-        0: "warning",
+        2: "success",
-        1: "success",
+        1: "danger",
-        2: "danger",
       };
       return statusMap[status];
     },