Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin

src/views/auxiliaryFittings/salesManagement/auxiliarySalesOrder/index.vue

@@ -114,10 +114,10 @@ export default {
       return (
         <div class='operation-btns'>
 		  <el-button type="text" onClick={() => {
-				this.id = row.salesId
-		    this.formDialogType = 1
+			this.id = row.salesId
+		    this.formDialogType = row.flag == 'SAVE'?1:2
 		    this.openForm()
-		  }}>编辑</el-button>
+		  }}>{row.flag == 'SAVE'?'编辑':"详情"}</el-button>
         </div>
       )
     },

src/views/auxiliaryFittings/salesManagement/components/auxiliaryAdjustPriceOrderDetail.vue

@@ -46,7 +46,7 @@
 						</el-col>
 						<el-col :span="12">
 							<el-form-item label="网点名称" prop="websitId" :required="true">
-								<el-select v-model="formData.websit" value-key="websitId" @change="changeWebsit" placeholder="请选择" style="width: 100%;">
+								<el-select v-model="formData.websit" :disabled="formData.flag == 'OK'" value-key="websitId" @change="changeWebsit" placeholder="请选择" style="width: 100%;">
 								    <el-option
 								      v-for="item in websitList"
 								      :key="item.websitId"
@@ -63,7 +63,7 @@
 						</el-col>
 						<el-col :span="24">
 							<el-form-item label="备注">
-								<el-input type="textarea" :rows="4" v-model="formData.remark" placeholder="请输入"></el-input>
+								<el-input type="textarea" :rows="4" :disabled="formData.flag == 'OK'" v-model="formData.remark" placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -79,7 +79,7 @@
 				<el-table :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
 					<el-table-column label="大类名称" align="center">
 						<template slot-scope="scope">
-							<el-select v-model="scope.row.productCategory" value-key="categoryId" @change="changeMain" :disabled="isEdit != scope.$index" placeholder="请选择" style="width: 100%;">
+							<el-select v-model="scope.row.productCategory" value-key="categoryId" @change="changeMain" :disabled="isEdit != scope.$index || formData.flag == 'OK'" placeholder="请选择" style="width: 100%;">
 							    <el-option
 							      v-for="item in mainList"
 							      :key="item.categoryId"
@@ -93,7 +93,7 @@
 						<template slot-scope="scope">
 							<el-select v-model="scope.row.goodsCategory" @change="changeSmall" @focus="()=>{
 									if(!scope.row.productCategory){return this.$message.warning('请先选择大类！');}
-								}" :disabled="isEdit != scope.$index" value-key="categoryId" placeholder="请选择" style="width: 100%;">
+								}" :disabled="isEdit != scope.$index || formData.flag == 'OK'" value-key="categoryId" placeholder="请选择" style="width: 100%;">
 							    <el-option
 							      v-for="item in scope.row.productCategory.items"
 							      :key="item.categoryId"
@@ -105,7 +105,7 @@
 					</el-table-column>
 					<el-table-column label="辅材名称" align="center">
 						<template slot-scope="scope">
-							<el-select v-model="scope.row.goods" @change="changeGoods" value-key="goodsId" :disabled="isEdit != scope.$index" placeholder="请选择" style="width: 100%;">
+							<el-select v-model="scope.row.goods" @change="changeGoods" value-key="goodsId" :disabled="isEdit != scope.$index || formData.flag == 'OK'" placeholder="请选择" style="width: 100%;">
 							    <el-option
 							      v-for="item in scope.row.goodsList"
 							      :key="item.goodsId"
@@ -125,12 +125,12 @@
 					</el-table-column>
 					<el-table-column prop="" align="center" label="新售价" >
 						<template slot-scope="scope">
-							<el-input type="number" v-model="scope.row.newPrice" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
+							<el-input type="number" v-model="scope.row.newPrice" :disabled="isEdit != scope.$index || formData.flag == 'OK'" placeholder="请输入"></el-input>
 						</template>
 					</el-table-column>
 					<el-table-column prop="goods.qty" align="center" label="库存数量"></el-table-column>
 					<el-table-column label="操作" align="right" width="140">
-						<template slot-scope="scope">
+						<template slot-scope="scope" v-if="formData.flag != 'OK'">
 							<el-button size="mini" type="primary" v-if="scope.$index != isEdit" @click="isEdit = scope.$index">编辑</el-button>
 							<el-button size="mini" type="danger" @click="dataList.splice(scope.$index,1)">删除</el-button>
 						</template>

src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesOrderDetail.vue

@@ -26,7 +26,7 @@
 						</el-col>
 						<el-col :span="12">
 							<el-form-item label="网点名称" prop="websitId" :required="true">
-								<el-select v-model="formData.websit" value-key="websitId" @change="changeWebsit" placeholder="请选择" style="width: 100%;">
+								<el-select v-model="formData.websit" :disabled="formData.flag != 'SAVE' && formType!=0" value-key="websitId" @change="changeWebsit" placeholder="请选择" style="width: 100%;">
 								    <el-option
 								      v-for="item in websitList"
 								      :key="item.websitId"
@@ -38,7 +38,7 @@
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="师傅姓名" prop="worker" :required="true">
-								<el-select v-model="formData.worker" value-key="nickName" @focus="()=>{
+								<el-select v-model="formData.worker" :disabled="formData.flag != 'SAVE' && formType!=0" value-key="nickName" @focus="()=>{
 									if(!this.formData.websitId){return this.$message.warning('请先选择网点名称！');}
 								}" filterable @change="changeWorker" @blur="workerBlur" placeholder="请选择" style="width: 100%;">
 								    <el-option
@@ -52,12 +52,12 @@
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="师傅身份证" prop="idcard" :required="true">
-								<el-input type="text" v-model="formData.idcard" placeholder="请输入"></el-input>
+								<el-input type="text" :disabled="formData.flag != 'SAVE' && formType!=0" v-model="formData.idcard" placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="8">
 							<el-form-item label="师傅联系电话" prop="phone" :required="true">
-								<el-input type="text" v-model="formData.phone" placeholder="请输入"></el-input>
+								<el-input type="text" :disabled="formData.flag != 'SAVE' && formType!=0" v-model="formData.phone" placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6" v-if="id">
@@ -87,7 +87,7 @@
 						</el-col>
 						<el-col :span="12">
 							<el-form-item label="订单来源" prop="source" :required="true">
-								<el-select v-model="formData.source" placeholder="请选择" style="width: 100%;">
+								<el-select v-model="formData.source" :disabled="formData.flag != 'SAVE' && formType!=0" placeholder="请选择" style="width: 100%;">
 								    <el-option
 								      v-for="item in [{name: '在线订单',id: 'ONLINE'},{name: '自建订单',id: 'SELF'}]"
 								      :key="item.id"
@@ -99,7 +99,7 @@
 						</el-col>
 						<el-col :span="9">
 							<el-form-item label="支付方式" prop="payType" :required="true">
-								<el-select v-model="formData.payType" placeholder="请选择" style="width: 100%;">
+								<el-select v-model="formData.payType" :disabled="formData.flag != 'SAVE' && formType!=0" placeholder="请选择" style="width: 100%;">
 								    <el-option
 								      v-for="item in [{name: '现金',id: 'CASH'},{name: '微信',id: 'WECHAT'}]"
 								      :key="item.id"
@@ -114,7 +114,7 @@
 						</el-col>
 						<el-col :span="24">
 							<el-form-item label="备注">
-								<el-input type="textarea" :rows="4" v-model="formData.remark" placeholder="请输入"></el-input>
+								<el-input type="textarea" :rows="4" :disabled="formData.flag != 'SAVE' && formType!=0" v-model="formData.remark" placeholder="请输入"></el-input>
 							</el-form-item>
 						</el-col>
 					</el-row>
@@ -125,12 +125,12 @@
 			<div slot="header" class="clearfix">
 				<span>辅材信息</span>
 			</div>
-			<el-button size="small" type="primary" @click="add()">添加</el-button>
+			<el-button size="small" v-if="formData.flag != 'SAVE' && formType!=0" type="primary" @click="add()">添加</el-button>
 			<div class="table">
 				<el-table :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
 					<el-table-column label="大类名称" align="center">
 						<template slot-scope="scope">
-							<el-select v-model="scope.row.parentCategory" value-key="categoryId" @change="changeMain" :disabled="isEdit != scope.$index" placeholder="请选择" style="width: 100%;">
+							<el-select v-model="scope.row.parentCategory" value-key="categoryId" @change="changeMain" :disabled="isEdit != scope.$index || formData.flag != 'SAVE'" placeholder="请选择" style="width: 100%;">
 							    <el-option
 							      v-for="item in mainList"
 							      :key="item.categoryId"
@@ -144,7 +144,7 @@
 						<template slot-scope="scope">
 							<el-select v-model="scope.row.goodsCategory" @change="changeSmall" @focus="()=>{
 									if(!scope.row.parentCategory){return this.$message.warning('请先选择大类！');}
-								}" :disabled="isEdit != scope.$index" value-key="categoryId" placeholder="请选择" style="width: 100%;">
+								}" :disabled="isEdit != scope.$index || formData.flag != 'SAVE'" value-key="categoryId" placeholder="请选择" style="width: 100%;">
 							    <el-option
 							      v-for="item in scope.row.parentCategory.items"
 							      :key="item.categoryId"
@@ -156,7 +156,7 @@
 					</el-table-column>
 					<el-table-column label="辅材名称" align="center">
 						<template slot-scope="scope">
-							<el-select v-model="scope.row.goods" @change="changeGoods" value-key="goodsId" :disabled="isEdit != scope.$index" placeholder="请选择" style="width: 100%;">
+							<el-select v-model="scope.row.goods" @change="changeGoods" value-key="goodsId" :disabled="isEdit != scope.$index || formData.flag != 'SAVE'" placeholder="请选择" style="width: 100%;">
 							    <el-option
 							      v-for="item in scope.row.goodsList"
 							      :key="item.goodsId"
@@ -169,7 +169,7 @@
 					<el-table-column prop="goods.goodsSalesUnit" align="center" label="单位" ></el-table-column>
 					<el-table-column prop="" align="center" label="数量" >
 						<template slot-scope="scope">
-							<el-input type="number" v-model="scope.row.salesQty" :disabled="isEdit != scope.$index" placeholder="请输入"></el-input>
+							<el-input type="number" v-model="scope.row.salesQty" :disabled="isEdit != scope.$index || formData.flag != 'SAVE'" placeholder="请输入"></el-input>
 						</template>
 					</el-table-column>
 					<el-table-column prop="goods.goodsCode" align="center" label="商品代码"></el-table-column>
@@ -178,7 +178,7 @@
 					<el-table-column prop="goods.saleAmount" align="center" label="销售金额" ></el-table-column>
 					<el-table-column prop="goods.qty" align="center" label="库存数量"></el-table-column>
 					<el-table-column label="操作" align="right" width="140">
-						<template slot-scope="scope">
+						<template slot-scope="scope" v-if="formData.flag == 'SAVE'">
 							<el-button size="mini" type="primary" v-if="scope.$index != isEdit" @click="isEdit = scope.$index">编辑</el-button>
 							<el-button size="mini" type="danger" @click="dataList.splice(scope.$index,1)">删除</el-button>
 						</template>