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

src/api/basic/busType.js

@@ -82,6 +82,7 @@ export function getBusTypeListByUser(params) {
     params: params
   });
 }
+
 export function filterUnUse(params) {
   return axios({
     url: "/udiwms/localBusType/filterUnUse",
@@ -100,3 +101,21 @@ export function findByInvUser(query) {
 }
 
 
+export function findChangeOrigin(query) {
+  return axios({
+    url: "/udiwms/busType/change/origin",
+    method: "get",
+    params: query
+  });
+}
+
+
+export function findChangeTarget(query) {
+  return axios({
+    url: "/udiwms/busType/change/target",
+    method: "get",
+    params: query
+  });
+}
+
+

src/views/basic/busType/bussinessTypeModify.vue

@@ -117,8 +117,8 @@
             <el-select v-model="inputQuery.spUse"
                        :disabled=" inputQuery.corpType!=2 "
                        style="width: 90%" placeholder="是否允许" clearable>
-              <el-option label="是" :value="true"></el-option>
-              <el-option label="否" :value="false"></el-option>
+              <el-option label="是" :value="1"></el-option>
+              <el-option label="否" :value="0"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -1156,7 +1156,7 @@ export default {
 
       if (this.inputQuery.corpType != 2) {    //往来类型非供应商时，采购方式未无
         this.inputQuery.actionType = 0;
-        this.inputQuery.spUse = false;
+        this.inputQuery.spUse = 0;
       }
 
     },

src/views/basic/product/productEdit.vue

@@ -148,7 +148,7 @@
 
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable1">
-            <el-form-item :label="productRemarkSet.remarkTitle1+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle1+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -158,7 +158,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable2">
-            <el-form-item :label="productRemarkSet.remarkTitle2+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle2+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -170,7 +170,7 @@
         </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
-            <el-form-item :label="productRemarkSet.remarkTitle3+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle3+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -180,7 +180,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable4">
-            <el-form-item :label="productRemarkSet.remarkTitle4+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle4+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -192,7 +192,7 @@
         </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
-            <el-form-item :label="productRemarkSet.remarkTitle5+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle5+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -202,7 +202,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable6">
-            <el-form-item :label="productRemarkSet.remarkTitle6+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle6+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -214,7 +214,7 @@
         </el-row>
         <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
-            <el-form-item :label="productRemarkSet.remarkTitle7+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle7+':'">
               <el-input
                 style="width: 80%"
                 size="small"
@@ -224,7 +224,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
-            <el-form-item :label="productRemarkSet.remarkTitle8+':'" +>
+            <el-form-item :label="productRemarkSet.remarkTitle8+':'">
               <el-input
                 style="width: 80%"
                 size="small"

src/views/remind/invRemindSetModify.vue

@@ -29,6 +29,36 @@
         </el-col>
       </el-row>
 
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="低库存预警数量：">
+            <el-input v-model="setData.lowStockNum" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="库存积压预警数量：">
+            <el-input v-model="setData.overStockNum" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="近效期预警时间：">
+            <el-input v-model="setData.recentDateTime" disabled></el-input>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="近效期预警时间单位：">
+            <el-input v-show="setData.isDateBy == 1" value="天" disabled></el-input>
+            <el-input v-show="setData.isDateBy == 2" value="小时" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
       <el-divider></el-divider>
 
       <el-row>

src/views/system/param/busTypePre.vue

@@ -215,6 +215,10 @@ export default {
         this.$message.error("目标出入库单与目标业务单不能同时为空！")
         return;
       }
+      if (isBlank(this.inputQuery.supplementAll)) {
+        this.$message.error("补单方式不能为空！")
+        return;
+      }
       // if (isBlank(this.inputQuery.invCode)) {
       //   this.$message.error("目标所在仓库不能为空！")
       //   return;

src/views/system/param/busTypePreModify.vue

@@ -90,17 +90,28 @@
         </el-col>
       </el-row>
       <el-row style="margin-bottom: 20px">
+
+        <el-col :span="11">
+          <el-form-item label="创建单据模式" prop="createType">
+            <el-select v-model="inputQuery.createType" placeholder="创建单据模式" size="small"
+                       style="width: 90%">
+              <el-option label="送货至入库补单" :value="1"></el-option>
+              <el-option label="向上级仓库补单" :value="2"></el-option>
+              <el-option label="寄售/预验收转入库补单" :value="3"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="11">
           <el-form-item label="审核状态" prop="auditStatus" class="query-form-item">
             <el-radio-group v-model="inputQuery.auditStatus">
               <el-radio :label="1">草稿</el-radio>
               <el-radio :label="2">待核对</el-radio>
             </el-radio-group>
-<!--            <el-select v-model="inputQuery.auditStatus" placeholder="请选择出入库类型" style="width: 90%">-->
-<!--              <el-radio :label="1">草稿</el-radio>-->
-<!--              <el-radio :label="2">待核对</el-radio>-->
-<!--              <el-radio :label="3">待审核</el-radio>-->
-<!--            </el-select>-->
+            <!--            <el-select v-model="inputQuery.auditStatus" placeholder="请选择出入库类型" style="width: 90%">-->
+            <!--              <el-radio :label="1">草稿</el-radio>-->
+            <!--              <el-radio :label="2">待核对</el-radio>-->
+            <!--              <el-radio :label="3">待审核</el-radio>-->
+            <!--            </el-select>-->
 
           </el-form-item>
         </el-col>
@@ -108,7 +119,7 @@
       <el-divider content-position="left">生成业务单</el-divider>
       <el-row>
         <el-col :span="11">
-          <el-form-item label="目标业务单" prop="action">
+          <el-form-item label="目标业务单">
             <el-select v-model="inputQuery.targetBusAction" placeholder="目标业务单" clearable size="small"
                        style="width: 90%">
               <el-option
@@ -161,7 +172,7 @@
 
 <script>
 
-import {getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
+import {findChangeOrigin, findChangeTarget, getBusTypeList, getBusTypeListByUser} from "@/api/basic/busType";
 import {filterSubAll, findByFrom} from "@/api/system/invSubWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {getBusTypeChangeList} from "@/api/basic/busTypeChange";
@@ -202,6 +213,13 @@ export default {
             trigger: "blur"
           }
         ],
+        supplementAll: [
+          {
+            required: true,
+            message: "补单方式不能为空",
+            trigger: "blur"
+          }
+        ],
         // invCode: [
         //   {
         //     required: true,
@@ -235,7 +253,7 @@ export default {
       let query = {
         enable: true
       };
-      getBusTypeList(query).then((res) => {
+      findChangeOrigin(query).then((res) => {
         if (res.code === 20000) {
           this.originBusTypes = res.data.list || [];
         }
@@ -246,7 +264,7 @@ export default {
       let query = {
         enable: true
       };
-      getBusTypeList(query).then((res) => {
+      findChangeTarget(query).then((res) => {
         if (res.code === 20000) {
           this.targetTypes = res.data.list || [];
         }
@@ -300,8 +318,9 @@ export default {
   created() {
     if (this.inputQuery.originAction == null) {
       this.isAdd = true;
-      // this.inputQuery.auditStatus = 2;
-      // this.inputQuery.busAuditStatus = 2;
+      this.inputQuery.createType = 1;
+      this.inputQuery.auditStatus = 1;
+      this.inputQuery.busAuditStatus = 1;
     } else {
       this.getTargetBusType();
     }

src/views/thirdSys/api/BasicThirdSysDetailModify.vue

@@ -41,6 +41,19 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row v-if="inputDetailQuery.fromType === 3" :gutter="20" class="el-row" type="flex" align="middle">
+        <el-col :span="24" class="el-col">
+          <el-form-item label-width="100px" label="请求时间">
+            <el-input
+              style="width: 80%"
+              splaceholder="请输入请求时间 单位：分钟"
+              type="number"
+              min="0"
+              v-model="inputDetailQuery.time"
+            ></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
       <el-row :gutter="20" class="el-row" type="flex" align="middle">
         <el-col :span="24" class="el-col">

src/views/thirdSys/api/index.vue

@@ -460,6 +460,17 @@ export default {
         });
     },
     onDetailModifySubmit() {
+      if (this.inputDetailQuery.fromType === 3) {
+        if (isBlank(this.inputDetailQuery.time)) {
+          this.$message.error("接口请求时间不能为空");
+          return;
+        }
+        if (this.inputDetailQuery.time < 0) {
+          this.$message.error("接口请求时间不能小于0");
+          return;
+        }
+      }
+
       updateDetailBasicThirdSys(this.inputDetailQuery)
         .then((response) => {
           if (response.code == 20000) {