diff --git a/src/views/basic/workplace/addBusTypeDialog.vue b/src/views/basic/workplace/addBusTypeDialog.vue
index 622dedda..82d9d389 100644
--- a/src/views/basic/workplace/addBusTypeDialog.vue
+++ b/src/views/basic/workplace/addBusTypeDialog.vue
@@ -24,8 +24,6 @@
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="单据类型:" prop="documentTypeCode" class="query-form-item">
<el-select v-model="formData.documentTypeCode" placeholder="请选择单据类型"
@@ -51,9 +49,6 @@
></el-input>
</el-form-item>
</el-col>
-
- </el-row>
- <el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="队列管理:" prop="autoTag" class="query-form-item">
<el-select v-model="formData.autoTag" style="width: 80%" placeholder="请选择是否队列设备"
@@ -71,8 +66,25 @@
</el-select>
</el-form-item>
</el-col>
-
+ <el-col :span="12" class="el-col" v-if="formData.autoTag == 1">
+ <el-form-item label="独占工位库存:" prop="monopoly" class="query-form-item">
+ <el-select v-model="formData.monopoly" style="width: 80%" placeholder="独占工位库存"
+ :disabled="formData.autoTag == 0">
+ <el-option label="否" :value="0"></el-option>
+ <el-option label="是" :value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" class="el-col">
+ <el-form-item label="是否常用:" prop="isPopular" class="query-form-item">
+ <el-select v-model="formData.isPopular" style="width: 80%" placeholder="单据是否常用">
+ <el-option label="是" :value="1"></el-option>
+ <el-option label="否" :value="0"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
+ <el-divider></el-divider>
<el-row :gutter="24" class="el-row">
<!--<el-col :span="12" class="el-col">-->
<!-- <el-form-item label="作业类型:" prop="workplaceType" class="query-form-item">-->
@@ -106,11 +118,6 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
-
- <el-row :gutter="24" class="el-row">
-
-
<el-col :span="12" class="el-col">
<el-form-item label="异常提醒方式:" prop="warnType" class="query-form-item">
<el-select v-model="formData.warnType" style="width: 80%" placeholder="选择扫码方式">
@@ -121,26 +128,16 @@
</el-form-item>
</el-col>
<el-col :span="12" class="el-col">
- <el-form-item label="默认仓库:" prop="invCode" class="query-form-item">
- <el-select v-model="formData.invCode" placeholder="请选择仓库"
- style="width: 80%"
- clearable
- >
- <el-option
- v-for="item in invList"
- :key="item.name"
- :label="item.name"
- :value="item.code"
- >
- <span style="float: left">{{ item.name }}</span>
- </el-option>
+ <el-form-item label="单据完成条件:" prop="monopoly" class="query-form-item">
+ <el-select v-model="formData.orderFinishVerify" style="width: 80%" placeholder="单据完成条件">
+ <el-option label="完全赋码" :value="0"></el-option>
+ <el-option label="部分赋码" :value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
+ <el-divider></el-divider>
<el-row :gutter="24" class="el-row">
-
-
<el-col :span="12" class="el-col">
<el-form-item label="往来单位类型:" prop="corpType" class="query-form-item">
<el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型"
@@ -162,37 +159,25 @@
></el-input>
</el-form-item>
</el-col>
-
- </el-row>
-
- <el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
- <el-form-item label="单据完成条件:" prop="monopoly" class="query-form-item">
- <el-select v-model="formData.orderFinishVerify" style="width: 80%" placeholder="单据完成条件" >
- <el-option label="完全赋码" :value="0"></el-option>
- <el-option label="部分赋码" :value="1"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="12" class="el-col" v-if="formData.autoTag == 1">
- <el-form-item label="独占工位库存:" prop="monopoly" class="query-form-item">
- <el-select v-model="formData.monopoly" style="width: 80%" placeholder="独占工位库存" :disabled="formData.autoTag == 0" >
- <el-option label="否" :value="0"></el-option>
- <el-option label="是" :value="1"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="24" class="el-row">
- <el-col :span="12" class="el-col">
- <el-form-item label="是否常用:" prop="isPopular" class="query-form-item">
- <el-select v-model="formData.isPopular" style="width: 80%" placeholder="单据是否常用" >
- <el-option label="是" :value="1"></el-option>
- <el-option label="否" :value="0"></el-option>
+ <el-form-item label="默认仓库:" prop="invCode" class="query-form-item">
+ <el-select v-model="formData.invCode" placeholder="请选择仓库"
+ style="width: 80%"
+ clearable
+ >
+ <el-option
+ v-for="item in invList"
+ :key="item.name"
+ :label="item.name"
+ :value="item.code"
+ >
+ <span style="float: left">{{ item.name }}</span>
+ </el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
+ <el-divider></el-divider>
<el-row :gutter="24" class="el-row">
<el-col class="el-col">
<el-form-item label="备注:" prop="remark" class="query-form-item">
@@ -485,7 +470,7 @@ export default {
if (this.upData != null) {
console.log(this.upData)
this.formData = this.upData
- if (this.formData.invCode != 0){
+ if (this.formData.invCode != 0) {
this.formData.invCode = this.upData.invCode + ''
}
if (this.formData.invCode == 0) {
diff --git a/src/views/collect/CollectOrderTabs.vue b/src/views/collect/CollectOrderTabs.vue
index 5d18294e..fdb760bc 100644
--- a/src/views/collect/CollectOrderTabs.vue
+++ b/src/views/collect/CollectOrderTabs.vue
@@ -9,15 +9,15 @@
<el-form :model="formData" class="order-el-form" ref="formData" label-width="120px" >
<el-col :span="18" style="margin-left: 0px" >
- <span style="font-size: 16px;color: #409EFF">当前工位:    <span style="font-size: 16px;color: #000000">{{this.formData.workplaceName}}</span>
+ <span style="font-size: 14px;color: #909399">当前工位:    <span style="font-size: 16px;color: #000000">{{this.formData.workplaceName}}</span>
    
<!-- <span :style="{ color: formData.workplaceStatus === 0 ? 'green' : 'red' }"> ({{ formData.workplaceStatus === 0 ? '服务中' : '服务暂停' }} ) </span>-->
<!-- <el-button type="primary" @click="toggleWorkplaceStatus" style="margin-left: 10px;" >切换状态</el-button>-->
</span>
- <span style="font-size: 16px;color: #409EFF;margin-left: 20px">当前业务类型:    <span style="font-size: 16px;color: #000000">{{this.formData.busName}}</span>
-      <el-button type="primary" @click="toggleBusType" style="margin-left: 10px;" >切换业务</el-button>
- <el-button type="danger" @click="closeAllTabs" style="margin-left: 10px;" v-if="this.showContextMenu">关闭所有</el-button>
+ <span style="font-size: 14px;color: #909399;margin-left: 20px">当前业务类型:    <span style="font-size: 16px;color: #000000">{{this.formData.busName}}</span>
+      <el-button type="primary" icon="el-icon-sort" @click="toggleBusType" style="margin-left: 10px;" >切换业务</el-button>
+ <el-button type="danger" @click="closeAllTabs" style="margin-left: 10px;" v-if="this.showContextMenu">关闭所有</el-button>
</span>
</el-col>
diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue
index e3a54717..73c42014 100644
--- a/src/views/collect/IoCreateOrder.vue
+++ b/src/views/collect/IoCreateOrder.vue
@@ -35,9 +35,9 @@
<!-- </el-alert>-->
- <el-row>
+ <el-row style="margin-bottom: 8px">
<el-button-group
- style="display: flex; margin-top: 15px; float: right"
+ style="display: flex; margin-top: 5px; float: right"
>
<!--<el-button size="mini" type="primary" @click.native="saveOrder()" :loading="saveLoading"-->
<!-->草稿保存-->
@@ -46,7 +46,8 @@
v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
>选入草稿单据
</el-button>
- <el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading" v-show="isLinkDisabled"
+ <el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"
+ v-show="isLinkDisabled"
v-if="splitType=='out'" style="margin-right: 8px;border-radius: 5%;"
>草稿保存
</el-button>
@@ -133,7 +134,7 @@
</el-row>
<el-row>
<el-col :span="6" v-if="!isLinkDisabled">
- <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:" >
+ <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">
<el-select
v-model="orderFormData.workPlaceCode"
placeholder="当前工位"
@@ -158,7 +159,7 @@
</el-col>
<el-col :span="6" v-if="!isLinkDisabled">
- <el-form-item prop="busType" class="query-form-item" label="业务类型:" >
+ <el-form-item prop="busType" class="query-form-item" label="业务类型:">
<el-select
v-model="orderFormData.busType"
placeholder="业务类型"
@@ -587,7 +588,7 @@ export default {
this.busQuery.workplaceCode = workplaceId
getWorkBindBusTypes(this.busQuery).then(res => {
if (res.code == 20000) {
- this.busTypeList = res.data.list || []
+ this.busTypeList = res.data.list || []
if (this.busTypeList.length == 1) {
this.orderFormData.busType = this.busTypeList[0].documentTypeCode
} else {
@@ -1878,7 +1879,7 @@ export default {
created() {
// this.splitType = this.$route.query.splitType;
// if (this.splitType == null)
- this.splitType = this.fromSplitType
+ this.splitType = this.fromSplitType
this.init();
if (this.$route.query.workplaceId != null) {
this.corpOrderIdDisabled = true
diff --git a/src/views/collect/chooseDraftOrderDialog.vue b/src/views/collect/chooseDraftOrderDialog.vue
index 1ff81476..6624b272 100644
--- a/src/views/collect/chooseDraftOrderDialog.vue
+++ b/src/views/collect/chooseDraftOrderDialog.vue
@@ -177,7 +177,7 @@
:key="item.columnName"
fixed="right"
>
- <template slot-scope="scope">
+ <template slot- ="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"