1.同步busUser分支的bug修复

src/views/basic/BasicThirdSysModify.vue

@@ -59,7 +59,7 @@
                 <el-col :span="18" class="el-col">
                     <div class="text item">
                         <div class="itemTag" style="width: 200px;">
-                            <span>第三方服务IP地址:&nbsp;</span>
+                            <span v-text="inputQuery.thirdName + 'IP地址: '"></span>
                         </div>
 
                         <el-input
@@ -122,7 +122,7 @@
                 <el-col :span="18" class="el-col">
                     <div class="text item">
                         <div class="itemTag" style="width: 200px;">
-                            <span>第三方服务接口授权:&nbsp;</span>
+                            <span v-text="inputQuery.thirdName + '接口授权:'">&nbsp;</span>
                         </div>
                     </div>
                 </el-col>

src/views/basic/BussinessTypeModify.vue

@@ -256,7 +256,7 @@
                     </el-checkbox>
                     <el-checkbox v-model="inputQuery.scanPreIn" :disabled="inputQuery.corpType!='2'">出库时必须校验预验收库存
                     </el-checkbox>
-                    <el-checkbox v-model="inputQuery.vailInv" :disabled="inputQuery.mainAction!='WareHouseOut'">是否允许无库存出库
+                    <el-checkbox v-model="inputQuery.vailInv" :disabled="inputQuery.mainAction!='WareHouseOut'">是否只允许有库存产品出库
                     </el-checkbox>
                     <el-checkbox v-model="inputQuery.codeFillCheck">采集UDI码时进行三期校验
                     </el-checkbox>

src/views/basic/invWarehouse.vue

@@ -1540,6 +1540,10 @@ export default {
                 this.getBussinessType(1,action);
         },
         selsectBussinessType(row){
+            if (this.currentRow.id !== row.id) {
+                this.$message.error("请先选择需要操作的分库！");
+                return;
+            }
           var busQuery = {
                       code: this.currentCode,
                       page: 1,

src/views/business/stockOrderDelSearch.vue

@@ -152,13 +152,6 @@
                             @click.native="rollback(scope.row)"
                         >撤回
                         </el-button> -->
-                        <el-button
-                            v-if="scope.row.uploadFlag"
-                            type="text"
-                            size="small"
-                            @click.native.stop="uploadSpms(scope.row)"
-                        >提交
-                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>

src/views/business/stockOrderNewSelectProduct.vue

@@ -183,7 +183,12 @@ export default {
         return {
             listQuery: {
                 purType: null,
-                billNo: "",
+                udiCode: null,
+                unicode: null,
+                cpmctymc: null,
+                ggxh: null,
+                ylqxzcrbarmc: null,
+                thrPiId: null,
                 page: 1,
                 limit: 10,
             },
@@ -249,12 +254,20 @@ export default {
             this.$router.push({
                 path: "",
             });
-            this.listQuery.udiCode=null
+            this.listQuery = {
-            this.listQuery.unionCode=null
+                purType: null,
-            this.listQuery.cpmctymc=null
+                udiCode: null,
-            this.listQuery.ggxh=null
+                unicode: null,
-            this.listQuery.ylqxzcrbarmc=null
+                cpmctymc: null,
-            this.listQuery.thrPiId=null
+                ggxh: null,
+                ylqxzcrbarmc: null,
+                thrPiId: null,
+                page: 1,
+                limit: 10
+            }
+            this.multipleSelection = [];
+            this.radioCheck = null;
+            this.currentRow = null;
             this.getList();
         },
         tableRowClassName({row}) {

src/views/inout/IOAddOrder.vue

@@ -831,13 +831,15 @@ export default {
                             message: "提交失败！" + this.editTitle,
                             customClass: 'messageIndex'
                         });
-
-
                     } else {
-                        this.$message({
+                        this.$alert(response.message, '提示', {
-                            type: 'error',
+                            confirmButtonText: '确定',
-                            message: "提交失败！" + this.editTitle,
+                            type: 'warning',
-                            customClass: 'messageIndex'
+                            closeOnClickModal: true,
+                            callback: action => {
+                                this.$refs.inputRef.focus();
+                                this.$refs.inputRef.select();
+                            }
                         });
                     }
                 }

src/views/inventory/innerOrder.vue

@@ -7,7 +7,7 @@
                     <el-form-item class="query-form-item">
                         <el-input
                             v-model="filterQuery.recordKey"
-                            placeholder="内部码打印单"
+                            placeholder="单据号"
                             clearable
                         ></el-input>
                     </el-form-item>
@@ -270,13 +270,11 @@ export default {
             listInnerOrderDetail(query) //查找该单号下的所有条码
                 .then((response) => {
                     this.detailList = response.data.list || [];
-                    this.total = response.data.total || 0;
                     this.loading = false;
                 })
                 .catch(() => {
                     this.loading = false;
                     this.detailList = [];
-                    this.total = 0;
                 });
         },
         submitOrder(row) {

src/views/inventory/innerOrderEditDialog.vue

@@ -39,16 +39,8 @@
                         </div>
                     </el-col>
                     <el-col :span="7">
-                        <el-form-item prop="billdate">
+                        <el-form-item prop="billNo">
-                            <el-date-picker
+                            <el-input v-model="formData.billDate" auto-complete="off" :disabled="true"></el-input>
-                                v-model="formData.billDate"
-                                type="datetime"
-                                placeholder="选择日期"
-                                style="width: 100%"
-                                :clearable="false"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                            >
-                            </el-date-picker>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -267,7 +259,7 @@ export default {
                     }
                     if (status === '0') {
                         for (let i = 0; i < this.codeArray.length; i++) {
-                            if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
+                            if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count === 0) {
                                 return this.$message.error('单据数量不能为0');
                             }
                         }
@@ -275,6 +267,16 @@ export default {
                     if (status == "1") {
                         this.submitFunction(status);
                     } else {
+                        if (this.codeArray.length < 1) {
+                            this.$message.warning('未添加产品');
+                            return;
+                        }
+                        for (let i = 0; i < this.codeArray.length; i++) {
+                            if (isBlank(this.codeArray[i].count) || this.codeArray[i].count === 0) {
+                                this.$message.error('单据数量不能为0');
+                                return;
+                            }
+                        }
                         let tip = "是否确定提交订单?";
                         this.$confirm(tip, "提示", {
                             confirmButtonText: "确定",
@@ -419,6 +421,8 @@ export default {
             this.query.limit = 100;
             this.query.orderIdFk = this.idQuery.id;
             this.formData = this.idQuery.formData;
+            this.formData.billNo = this.idQuery.formData.recordKey;
+            this.formData.billDate = this.idQuery.formData.createTime;
             this.orderEditor = true;
             this.sValue = this.formData.corpName;
             this.getStockOrderDetailList();