From 5ecb7958c96d3f0b6d47b79aff7eb306c2cf690f Mon Sep 17 00:00:00 2001 From: charles <981744753@qq.com> Date: 星期二, 06 八月 2024 11:16:58 +0800 Subject: [PATCH] gitlab上面的wms转移到公司git --- src/views/overview/AddOverviewDialog.vue | 2759 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 2,496 insertions(+), 263 deletions(-) diff --git a/src/views/overview/AddOverviewDialog.vue b/src/views/overview/AddOverviewDialog.vue index 1f8f11f..5410955 100644 --- a/src/views/overview/AddOverviewDialog.vue +++ b/src/views/overview/AddOverviewDialog.vue @@ -1,6 +1,65 @@ <template> <div class="add-common"> <el-dialog + title="閰嶇疆瀛楀吀" + :visible.sync="dictModel" + width="60%" + :destroy-on-close="true" + :before-close="handlerDictClose"> + <div style="text-align: right;margin: 10px 20px"> + <el-input @input="queryDictList(isSilkMarket?6:0)" v-model="keyword" style="width: 40%;margin-right: 20px" size="small" placeholder="璇疯緭鍏ュ叧閿瓧"> + <i slot="suffix" class="el-input__icon el-icon-search" @click="queryDictList(isSilkMarket?6:0)"></i> + </el-input> + <el-button type="primary" size="mini" @click="addDict">鏂板</el-button> + </div> + <el-row type="flex" justify="center" style="height:400px;margin-bottom: 20px"> + <el-col :span="22"> + <el-table :data="isSilkMarket?silkMarketList:dictList" border style="max-height: 364px;overflow-y: auto"> + <el-table-column label="搴忓彿" align="center"> + <template slot-scope="scope"> + <span>{{scope.$index+1}}</span> + </template> + </el-table-column> + <el-table-column prop="name" label="鍚嶇О" align="center"> + <template slot-scope="scope"> + <span v-if="!scope.row.isEdit">{{scope.row.name}}</span> + <el-input v-else v-model="scope.row.name" placeholder="璇疯緭鍏�"></el-input> + </template> + </el-table-column> + <el-table-column prop="type" label="绫诲瀷" align="center"> + <template slot-scope="scope"> + <div> + <span v-if="scope.row.type===1">鍏ュ簱绫诲瀷</span> + <span v-else-if="scope.row.type===2">鍑哄簱绫诲瀷</span> + <span v-else-if="scope.row.type===3">璋冩嫧绫诲瀷</span> + <span v-else-if="scope.row.type===4">鐩樼偣绫诲瀷</span> + <span v-else-if="scope.row.type===6">鍘熸枡浜у湴</span> + </div> + <!--<el-select v-else v-model="scope.row.type"> + <el-option label="鍏ュ簱绫诲瀷" :value="1"></el-option> + <el-option label="鍑哄簱绫诲瀷" :value="2"></el-option> + <el-option label="璋冩嫧绫诲瀷" :value="3"></el-option> + <el-option label="鐩樼偣绫诲瀷" :value="4"></el-option> + </el-select>--> + </template> + </el-table-column> + <el-table-column label="鎿嶄綔" align="center"> + <template slot-scope="scope"> + <div v-if="scope.row.isEdit"> + <el-button type="text" size="mini" @click="saveDict(scope.row)">淇濆瓨</el-button> + <el-button type="text" size="mini" @click="cancelDict()">鍙栨秷</el-button> + </div> + <div v-else> + <el-button type="text" size="mini" @click="editDict(scope.row,scope.$index)">缂栬緫</el-button> + <el-button type="text" size="mini" @click="deleteDict(scope.row.id)">鍒犻櫎</el-button> + </div> + </template> + </el-table-column> + </el-table> + </el-col> + </el-row> + </el-dialog> + <el-dialog :title="editCommonConfig.title + '閲囪喘鍏ュ簱'" :visible.sync="editConfig.visible" :width="dialogWidth" @@ -8,9 +67,16 @@ > <!-- 澶� --> <div slot="title" class="dialog-header"> - <span>{{ editCommonConfig.title + addName }}</span> + <span>{{ + editCommonConfig.title == "鏌ョ湅" + ? editCommonConfig.title + : editCommonConfig.title + addName}}</span> <div class="header_btns"> - <span class="btn"> + <span + class="btn" + :style="{ cursor: thatCursor, color: thatColor }" + @click="btnPrint" + :disabled="true"> <i class="el-icon-printer"></i> <span>鎵撳嵃</span> </span> @@ -18,7 +84,9 @@ <i class="el-icon-s-tools"></i> <span>鍔ㄤ綔</span> </span> - <el-button v-if="showEdit" plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button> + <el-button + v-if="showEdit" :disabled="this.editConfig.infomation.status == 5" + plain size="mini" style="margin-left: 15px" @click="editClick">缂栬緫</el-button> </div> </div> <!-- 鍐呭 --> @@ -28,38 +96,109 @@ :rules="rules" label-position="right" label-width="120px" - size="mini" - style="height: 60vh; overflow-x: hidden" - > + size="mini"> <div> - <!-- <div>aaa</div> --> - <StatusCommonView :showButton="showButton" :isDelClick="isDelClick" :list="list" @delClick="delClick" /> + <StatusCommonView + :showButton="showButton" + :isValidateClick="isValidateClick" + :isDelClick="isDelClick" + :isCancel="isCancel" + :list="list" + :showCancel="showCancel" + @delClick="delClick" + @validateClick="validateClick" + @btnCancel="btnCancel"/> </div> <div class="basic-info"> <div class="basic-info-view"> <el-row> <el-col :span="12"> + <el-form-item prop="number"> + <span slot="label">{{ + workType == 1 + ? "鍏ュ簱" + : workType == 2 + ? "鍑哄簱" + : !workType?"鐩樼偣":"璋冩嫧" + }}鍗曞彿</span> + <el-input + style="width: 85%" + v-if="editConfig.title == '缂栬緫' || + editConfig.title == '鏌ョ湅' || + (editConfig.title == '鏂板缓' && + codenumer &&(explain != '' || isIdDisabled))" + :disabled="editConfig.title != '鏂板缓'" + v-model="editConfig.infomation.number" + placeholder="璇疯緭鍏ョ紪鐮�"> + </el-input> + <span + v-else-if="editConfig.title == '鏂板缓'" + style="color: #f56c6c; width: 85%">璇蜂紭鍏堥厤缃紪鐮佽鑼� + <el-button type="text" @click="numberClick"> + 閰嶇疆瑙勮寖 + </el-button> + </span> + </el-form-item> + </el-col> + <el-col :span="12"> <el-form-item prop="companyName"> - <span slot="label">{{ workType === 1 ? "瀹㈡埛" : workType === 2 ? "閫佽揣鍦板潃" : "鑱旂郴浜�" }}</span> + <span slot="label">{{ + workType == 1 + ? "渚涘簲鍟�" + : workType == 2 + ? "瀹㈡埛" + : "鑱旂郴浜�"}}</span> <el-select - v-model="editConfig.infomation.company" + v-if="workType == 1" + v-model="editConfig.infomation.companyName" placeholder="璇烽�夋嫨" size="mini" style="width: 90%" :disabled="!showFooter" - > + @change="companyChange"> <el-option - v-for="item in companyOptions" + v-for="item in supplierOptions" + :key="item.SupplierId" + :label="item.SupplierName" + :value="{ + value: item.SupplierId, + label: item.SupplierName}"> + </el-option> + </el-select> + <el-select + v-else-if="workType == 2" + v-model="editConfig.infomation.companyName" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + :disabled="!showFooter" + @change="companyChange"> + <el-option + v-for="item in clientOptions" + :key="item.ClientId" + :label="item.ClientName" + :value="{ value: item.ClientId, label: item.ClientName }"> + </el-option> + </el-select> + <el-select + v-else + v-model="editConfig.infomation.companyName" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + :disabled="!showFooter" + @change="companyChange"> + <el-option + v-for="item in personelOptions" :key="item.id" :label="item.name" - :value="{ value: item.id, label: item.name }" - > + :value="{ value: item.id, label: item.name }"> </el-option> </el-select> </el-form-item> </el-col> <!-- <el-col :span="12"> - <el-form-item v-if="workType === 3" label="鑱旂郴浜�" prop="contacterName"> + <el-form-item v-if="workType == 3" label="鑱旂郴浜�" prop="contacterName"> <el-select v-model="editConfig.infomation.contacterName" placeholder="璇烽�夋嫨" @@ -73,7 +212,7 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item v-if="workType === 2" label="閫佽揣鍦板潃" prop="client_name"> + <el-form-item v-if="workType == 2" label="閫佽揣鍦板潃" prop="client_name"> <el-select v-model="editConfig.infomation.memberId" placeholder="璇烽�夋嫨" @@ -99,13 +238,50 @@ </el-date-picker> </el-form-item> </el-col> - <el-col :span="12"> - <el-form-item label="鍏ュ簱绫诲瀷"> - <el-input v-model="receiptType" disabled style="width: 90%"></el-input> + <el-col v-if="showOperationType" :span="12"> + <el-form-item label="涓氬姟绫诲瀷" prop="operationTypeId"> + <el-select + v-model="editConfig.infomation.operationTypeId" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + :disabled="!showFooter" + > + <el-option + v-for="item in operationTypeOptions" + :key="item.id" + :label="item.name" + :value="item.id"> + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col v-else :span="12"> + <el-form-item label="涓氬姟绫诲瀷"> + <el-input + v-model="receiptType" + disabled + style="width: 90%" + ></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item :label="inventoryDealerTypeLabel"> + <el-select + v-model="editConfig.infomation.dealerType" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 80%" + :disabled="!showFooter" + filterable + > + <el-option v-for="dict in dictList" :key="dict.id" :label="dict.name" :value="dict.name"></el-option> + </el-select> + <el-button style="margin-left: 10px" size="mini" @click="settingDealerType" class="el-icon-setting" type="text"></el-button> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鏉ユ簮鍗曟嵁" prop="sourceNumber"> + <el-form-item label="鏉ユ簮鍗曟嵁"> <el-input v-model="editConfig.infomation.sourceNumber" placeholder="渚嬪:PO0032" @@ -114,32 +290,274 @@ ></el-input> </el-form-item> </el-col> - <el-col :span="12"> - <el-form-item v-if="workType !== 1" label="婧愪綅缃�" prop="fromLocationId"> + <el-col :span="12" v-if="workType==1"> + <el-form-item + :label="workType == 1? '浠撳簱浣嶇疆' : '浠�'" + prop="location" + > <el-select - v-model="editConfig.infomation.fromLocationId" + @change="rootLocationChange" + v-model="editConfig.infomation.location" placeholder="璇烽�夋嫨" size="mini" style="width: 90%" :disabled="!showFooter" > - <el-option v-for="item in fromLocationOptions" :key="item.id" :label="item.name" :value="item.id"> + <el-option + v-for="item in formLocationOptions" + :key="item.id" + :label="item.jointName" + :value="item.id" + > + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="12" v-if="!workType"> + <el-form-item + label="浠撳簱" + prop="warehouseId"> + <el-select + @change="selWarehouse" + v-model="editConfig.infomation.warehouseId" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + > + <el-option v-for="warehouse in warehouseList" :key="warehouse.id" :label="warehouse.name" :value="warehouse.id"></el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="璐熻矗浜�" prop="contacterName"> + <el-select + v-model="editConfig.infomation.contacterName" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + :disabled="!showFooter" + @change="contacterChange" + > + <el-option + v-for="item in memberOptions" + :key="item.id" + :label="item.name" + :value="{ value: item.id, label: item.name }" + > + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="12" v-if="workType == 3"> + <el-form-item label="鑷�" prop="toLocation"> + <el-select + @change="toLocationChange" + v-model="editConfig.infomation.toLocation" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + filterable + :disabled="!showFooter" + > + <el-option + v-for="item in toLocationOptions" + :key="item.id" + :label="item.jointName" + :value="item.id" + > </el-option> </el-select> </el-form-item> </el-col> <el-col :span="12"> - <el-form-item v-if="workType !== 2" label="浠撳簱浣嶇疆" prop="toLocationId"> + <el-form-item label="涓荤" prop="managerObj"> + <!-- <SimpleSearchInput + style="width: 90%" + v-model="editConfig.infomation.manager" + :echoValue="editConfig.infomation.manager" + :echoName="editConfig.infomation.manager" + checkedNum="1" + :clearable="true" + request='2' + @select-user="setFormItem($event, 'manager', 'managerName')" + > + </SimpleSearchInput> --> <el-select - v-model="editConfig.infomation.toLocationId" + v-model="editConfig.infomation.managerObj" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + :disabled="!showFooter" + filterable + @change=" + (event) => + personChange( + event, + 'manager', + 'managerId', + 'managerObj' + )"> + <el-option + v-for="item in personelOptions" + :key="item.id" + :label="item.name" + :value="{ value: item.id, label: item.name }" + > + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="浼氳" prop="accountantObj"> + <!-- <SimpleSearchInput + style="width: 90%" + v-model="editConfig.infomation.accountant" + :echoValue="editConfig.infomation.accountant" + :echoName="editConfig.infomation.accountant" + checkedNum="1" + :clearable="true" + request='2' + @select-user="setFormItem($event, 'manager', 'accountantName')" + > + </SimpleSearchInput> --> + <el-select + v-model="editConfig.infomation.accountantObj" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + filterable + :disabled="!showFooter" + @change=" + (event) => + personChange( + event, + 'accountant', + 'accountantId', + 'accountantObj' + ) + " + > + <el-option + v-for="item in personelOptions" + :key="item.id" + :label="item.name" + :value="{ value: item.id, label: item.name }" + > + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="淇濈鍛�" prop="custodianObj"> + <!-- <SimpleSearchInput + style="width: 90%" + v-model="editConfig.infomation.custodian" + :echoValue="editConfig.infomation.custodian" + :echoName="editConfig.infomation.custodian" + checkedNum="1" + :clearable="true" + request='2' + @select-user="setFormItem($event, 'custodian', 'custodianName')" + > + </SimpleSearchInput> --> + <el-select + v-model="editConfig.infomation.custodianObj" + placeholder="璇烽�夋嫨" + size="mini" + style="width: 90%" + filterable + :disabled="!showFooter" + @change=" + (event) => + personChange( + event, + 'custodian', + 'custodianId', + 'custodianObj' + ) + " + > + <el-option + v-for="item in personelOptions" + :key="item.id" + :label="item.name" + :value="{ value: item.id, label: item.name }" > + </el-option> + </el-select> + </el-form-item> + </el-col> + <!-- <el-col :span="12"> + <el-form-item v-if="workType !== 1" label="閫佽揣绛栫暐" prop="client_name"> + <el-select + v-model="editConfig.infomation.memberId" placeholder="璇烽�夋嫨" size="mini" style="width: 90%" :disabled="!showFooter" > - <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id"> + <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id"> </el-option> </el-select> + </el-form-item> + </el-col> --> + <el-col :span="12"> + <el-form-item label="鍒涘缓浜�:"> + <el-input + :value="editConfig.infomation.createBy" + placeholder="鍒涘缓浜�" + style="width: 90%" + :disabled="true" + ></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="鍒涘缓鏃堕棿:"> + <el-input + :value="editConfig.infomation.createDate" + placeholder="鍒涘缓鏃堕棿" + style="width: 90%" + :disabled="true" + ></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="楠岃瘉浜�:"> + <el-input + :value="editConfig.infomation.checkBy" + placeholder="楠岃瘉浜�" + style="width: 90%" + :disabled="true" + ></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="楠岃瘉鏃堕棿:"> + <el-input + :value="editConfig.infomation.auditDate" + placeholder="楠岃瘉鏃堕棿" + style="width: 90%" + :disabled="true" + ></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="搴勫彛:"> + <el-select @change="selSilkMarket" :disabled="!showFooter" filterable style="width: 80%" v-model="editConfig.infomation.silkMarket "> + <el-option v-for="item in silkMarketList" :key="item.ID" :label="item.name" :value="item.code"></el-option> + </el-select> + <el-button style="margin-left: 10px" size="mini" @click="settingSilkMarket" class="el-icon-setting" type="text"></el-button> + </el-form-item> + </el-col> + <el-col :span="24"> + <el-form-item label="澶囨敞" prop="comment"> + <el-input + v-model.trim="editConfig.infomation.comment" + size="mini" + type="textarea" + style="width: 96%" + :autosize="{ minRows: 3 }" + :disabled="!showFooter" + ></el-input> </el-form-item> </el-col> </el-row> @@ -147,73 +565,235 @@ <div class="bottom"> <el-tabs v-model="activeName" type="card"> <!-- <el-tab-pane v-if="workType !== 1" label="璇︽儏" name="detail"> </el-tab-pane> --> - <el-tab-pane label="鎿嶄綔" name="first"> </el-tab-pane> - <el-tab-pane label="鍏朵粬淇℃伅" name="second"> - <div class="purchase-view"> - <div class="left"> - <div class="second-label">鍏朵粬淇℃伅</div> - <el-form-item v-if="workType !== 1" label="閫佽揣绛栫暐" prop="client_name"> - <el-select - v-model="editConfig.infomation.memberId" - placeholder="璇烽�夋嫨" - size="mini" - style="width: 90%" - :disabled="!showFooter" - > - <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id"> - </el-option> - </el-select> - </el-form-item> - <el-form-item label="璐熻矗浜�" prop="contacterName"> - <el-select - v-model="editConfig.infomation.contacterName" - placeholder="璇烽�夋嫨" - size="mini" - style="width: 90%" - :disabled="!showFooter" - > - <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id"> - </el-option> - </el-select> - </el-form-item> - </div> - <div class="right"></div> - </div> - </el-tab-pane> - <el-tab-pane label="澶囨敞" name="third"> - <el-form-item label="澶囨敞" prop="comment"> - <el-input - v-model.trim="editConfig.infomation.comment" - size="mini" - type="textarea" - style="width: 85%" - :autosize="{ minRows: 8 }" - :disabled="!showFooter" - ></el-input> - </el-form-item> - </el-tab-pane> + <el-tab-pane label="浜у搧" name="first"> </el-tab-pane> + <el-tab-pane + label="鐗╂祦淇℃伅" + name="two" + v-if="this.workType == 2" + ></el-tab-pane> </el-tabs> <!-- 鎿嶄綔 --> - <div v-if="activeName === 'first'"> + <div v-if="activeName == 'first'"> <CommonFormTableView + ref="tableView" + :warehouseId="warehouseId" + :islistingrules="true" + :addTypeIdMultiple="true" :product-table-list="productTableList" :detail-enter="!showFooter" + @selProductClick="selProductClick" @inputContent="inputContent" @addProductClick="addProductClick('鎿嶄綔')" + @getSelectArray="getSelectArray" + @selSonLocationClick="selSonLocationClick" + @emptyProductClick="emptyProductClick" + @clearupProduct="clearupProduct" + @selLocationClick="selLocationClick" + @selectProductArray="selectProductArray" + @deleteItems="deleteItems" > - <template v-if="showFooter" slot="tableButton"> - <el-table-column label="鎿嶄綔" width="60" fixed="right" align="center"> + <template slot="tableButton"> + <el-table-column label="鏁伴噺" align="center"> <template slot-scope="scope"> - <div @click="handleDelClick(scope, '鎿嶄綔')"> - <i class="el-icon-delete"></i> + <el-input size="mini" :disabled="editConfig.title==='鏌ョ湅'" v-model="scope.row.relAmount" @input="changeRelAmount(scope.row)"></el-input> + </template> + </el-table-column> + <el-table-column label="杈呭姪鏁伴噺" align="center" width="240"> + <template slot-scope="scope"> + <div v-if="Array.isArray(scope.row.moreUnitList)&&scope.row.moreUnitList.length>0"> + <template v-for="(moreUnitItem,index) in scope.row.moreUnitList"> + <span style="width: 70px;margin-left: -2px" v-if="!moreUnitItem.floating"> + {{doMoreUnitFormat(scope.row.relAmount/moreUnitItem.amount)}} + {{index!==scope.row.moreUnitList.length-1?'/':''}} + </span> + <span v-else> + <el-input :disabled="editConfig.title==='鏌ョ湅'" style="width: 70px;margin-left: 5px" size="mini" v-model="moreUnitItem.floatingValue"></el-input> + {{index!==scope.row.moreUnitList.length-1?'/':''}} + </span> + </template> </div> + <span v-else> + -- + </span> + </template> + </el-table-column> + <el-table-column label="杈呭姪鍗曚綅" align="center"> + <template slot-scope="scope"> + <span v-if="Array.isArray(scope.row.moreUnitList)&&scope.row.moreUnitList.length>0"> + {{scope.row.moreUnitList.map(item=>item.unit).join('/')}} + </span> + <span v-else>--</span> + </template> + </el-table-column> + <el-table-column label="搴勫彛" align="center" width="120"> + <template slot-scope="scope"> + <el-select :disabled="editConfig.title==='鏌ョ湅'" filterable v-model="scope.row.silkMarket" size="small"> + <el-option v-for="item in silkMarketList" :key="item.ID" :label="item.name" :value="item.code"></el-option> + </el-select> + </template> + </el-table-column> + <el-table-column label="鏄惁缁撳簞" align="center" width="80"> + <template slot-scope="scope"> + <el-select v-if="editConfig.title!=='鏌ョ湅'" v-model="scope.row.silkMarketClose" size="small"> + <el-option label="鏄�" value="鏄�"></el-option> + <el-option label="鍚�" value="鍚�"></el-option> + </el-select> + <span v-else>{{scope.row.silkMarketClose}}</span> + </template> + </el-table-column> + <el-table-column label="宸紓" align="center" v-if="!this.workType"> + <template slot-scope="scope"> + <span>{{!scope.row.relAmount?0-scope.row.amount:scope.row.relAmount-scope.row.amount}}</span> + </template> + </el-table-column> + <el-table-column label="鎴愭湰鍗曚环" prop="cost" align="center"> + <template slot-scope="scope"> + <el-input v-if="editConfig.title!=='鏌ョ湅'" type="number" v-model="scope.row.cost" size="mini"></el-input> + <span v-else>{{scope.row.cost}}</span> + </template> + </el-table-column> + <el-table-column label="鎴愭湰閲戦" align="center"> + <template slot-scope="scope"> + {{(scope.row.cost?scope.row.cost*scope.row.amount:0).toFixed(2)}} + </template> + </el-table-column> + <el-table-column label="閿�鍞崟浠�" prop="salePrice" align="center"> + <template slot-scope="scope"> + <el-input v-if="editConfig.title!=='鏌ョ湅'" type="number" v-model="scope.row.salePrice" size="mini"></el-input> + <span v-else>{{scope.row.salePrice}}</span> + </template> + </el-table-column> + <el-table-column label="閿�鍞噾棰�" align="center" > + <template slot-scope="scope"> + {{(scope.row.salePrice?scope.row.salePrice*scope.row.amount:0).toFixed(2)}} + </template> + </el-table-column> + <el-table-column label="姣涢噸" width="100" align="center" prop="grossWeight"></el-table-column> + <el-table-column label="鎬绘瘺閲�" width="100" align="center" prop="totalGrossWeight"></el-table-column> + <el-table-column label="鍑�閲�" width="100" align="center" prop="netWeight"></el-table-column> + <el-table-column label="鎬诲噣閲�" width="100" align="center" prop="totalNetWeight"></el-table-column> + + <el-table-column label="澶囨敞" width="100" align="center"> + <template slot-scope="scope"> + <el-input placeholder="澶囨敞" v-if="editConfig.title!='鏌ョ湅'" v-model="scope.row.remark" size="mini"></el-input> + <span v-else>{{scope.row.remark}}</span> + </template> + </el-table-column> + <!--{ label: "姣涢噸", prop: "grossWeight" }, + { label: "鎬绘瘺閲�", prop: "totalGrossWeight" }, + { label: "鍑�閲�", prop: "netWeight" }, + { label: "鎬诲噣閲�", prop: "totalNetWeight" }--> + + </template> + <template v-if="showFooter" slot="tableButton"> + <!-- fixed="right" --> + <el-table-column + label="鎿嶄綔" + width="60" + align="center"> + <template slot-scope="scope"> + <!-- <div @click="handleDelClick(scope, '鎿嶄綔')"> + <i class="el-icon-delete"></i> + </div> --> + <el-button + type="text" + size="small" + @click.stop="handleDelClick(scope, '鎿嶄綔')">鍒犻櫎</el-button> </template> </el-table-column> </template> </CommonFormTableView> </div> + <!-- 鐗╂祦淇℃伅 --> + <div v-if="activeName == 'two' && this.workType == 2"> + <el-form + :rules="rules2" + ref="shipmentsInfo" + label-position="right" + :model="editConfig.infomation" + label-width="120px" + size="mini" + style="margin-top: 20px" + > + <el-col :span="12"> + <el-form-item label="鎵胯繍鍟�"> + <el-select + size="mini" + :disabled="!showFooter" + v-model="editConfig.infomation.logisticCompanyId" + placeholder="璇烽�夋嫨" + style="width: 90%" + > + <el-option + v-for="item in editConfig.infomation.carrier" + :key="item.id" + :label="item.name" + :value="item.id" + > + </el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="杩愬崟鍙�"> + <el-input + style="width: 90%" + :disabled="!showFooter" + v-model="editConfig.infomation.waybillNumber" + ></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="鏀惰揣浜�"> + <el-input + style="width: 90%" + :disabled="!showFooter" + v-model="editConfig.infomation.receiverName" + ></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="鑱旂郴鐢佃瘽" prop="receiverPhone"> + <el-input + style="width: 90%" + :disabled="!showFooter" + v-model="editConfig.infomation.receiverPhone" + ></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="鏀惰揣鍦板潃"> + <el-input + style="width: 90%" + :disabled="!showFooter" + v-model="editConfig.infomation.receiverAddr" + ></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="閲嶉噺"> + <el-input + style="width: 90%" + :disabled="!showFooter" + type="number" + v-model="editConfig.infomation.weight" + ></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="鐗╂祦閲嶉噺"> + <el-input + style="width: 90%" + :disabled="!showFooter" + type="number" + v-model="editConfig.infomation.logisticWeight" + ></el-input> + </el-form-item> + </el-col> + </el-form> + </div> <!-- 璇︽儏 --> - <!-- <div v-if="activeName === 'detail'"> + <!-- <div v-if="activeName == 'detail'"> <CommonFormTableView :product-table-list="detailTableList" :detail-enter="!showFooter" @@ -235,9 +815,14 @@ </div> </el-form> <!-- 灏� --> - <div v-if="showFooter" slot="footer" class="dialog-footer"> + <div slot="footer" class="dialog-footer"> <!-- <el-button type="primary" size="small" @click="editConfig.visible = false">淇濆苟鎻愪氦瀹℃壒</el-button> --> - <el-button type="primary" size="small" @click="saveClick('form')">淇濆瓨</el-button> + <el-button + type="primary" + size="small" + @click="saveClick" + :disabled="!showFooter" + >淇濆瓨</el-button> <el-button size="small" @click="editConfig.visible = false">鍙栨秷</el-button> </div> </el-dialog> @@ -245,11 +830,37 @@ </template> <script> -import CommonFormTableView from "@/components/makepager/CommonFormTableView" -// import { addOperation } from "@/api/overview/overview" -import { getCompanyList } from "@/api/common/other" +import CommonFormTableView from "@/components/makepager/CommonFormTableView"; +import { + getLocationList, + addOperation, + updateOperation, + updateStatus, + stateCancel, + deleteOperation, + getListTransfer, + getLogisticCompanyList, + printReceipts, +} from "@/api/overview/overview"; +import { + getLocationProductAmount, + getDictListApi, + addDictApi, + deleteDictApi, + editDictApi +} from "@/api/operate/inventoryAdjustment" +import { + getSupplierList, + getCompanyList, + getClientList, +} from "@/api/common/other"; +// import SimpleSearchInput from "@/components/makepager/SimpleSearchInput" +import { getPersonnelList,getOperationInfoApi,getSilkDictListApi } from "@/api/product/product"; +import codeMixin from "@/views/overview/mixin/codeMixin"; +import { getWarehouseList } from '@/api/warehouseManage/warehouse.js' export default { name: "AddOverviewDialog", + mixins: [codeMixin], props: { editCommonConfig: { type: Object, @@ -257,50 +868,111 @@ return { visible: false, title: "鏂板缓", - infomation: {} - } - } + operationTypeId: 0, + infomation: {}, + }; + }, }, workType: { - type: Number, - default: 1 + type: [Number,String], + default: function () { + // return JSON.parse(window.sessionStorage.getItem('paramsData')).workType|| 1; + return 1; + }, }, addName: { type: String, - default: "璋冩嫧" - } + default: "璋冩嫧", + }, + showOperationType: { + type: Boolean, + default: false, + }, }, - components: { CommonFormTableView }, - computed: {}, + components: { + CommonFormTableView, + // SimpleSearchInput, + }, + computed: { + inventoryDealerTypeLabel(){ + if(this.workType===1){ + return '鍏ュ簱绫诲瀷:'; + }else if(this.workType===2){ + return '鍑哄簱绫诲瀷:'; + }else if(this.workType===3){ + return '璋冩嫧绫诲瀷:'; + }else { + return '鐩樼偣绫诲瀷:' + } + } + }, data() { return { + productIdArray:[], + keyword:"", + isSilkMarket:false, + silkMarketList:[], + warehouseId:this.editCommonConfig.infomation.warehouseId||0, + dictModel:false, + warehouseList:[], + dictList:[], + dictAllList:[], dialogWidth: "50%", editConfig: this.editCommonConfig, rules: { - client_name: [{ required: true, message: "璇烽�夋嫨瀹㈡埛鍚嶇О", trigger: "change" }], - number: [{ required: true, message: "璇疯緭鍏ラ��娆惧崟缂栧彿", trigger: "blur" }], - refundDate: [{ required: true, message: "璇烽�夋嫨閫�娆炬棩鏈�", trigger: "change" }], - memberId: [{ required: true, message: "璇烽�夋嫨閿�鍞礋璐d汉", trigger: "change" }], - sale_return_nunber: [{ required: true, message: "璇烽�夋嫨閿�鍞��璐у崟", trigger: "change" }] + sourceNumber: [ + { required: true, message: "璇疯緭鍏ユ潵婧愬崟鎹�", trigger: "blur" }, + ], + operationDate: [ + { required: true, message: "璇烽�夋嫨鏃ユ湡", trigger: "change" }, + ], + toLocation: [ + { required: true, message: "璇烽�夋嫨浣嶇疆", trigger: "change" }, + ], + warehouseId: [ + { required: true, message: "璇烽�夋嫨浠撳簱", trigger: "change" }, + ], + location: [ + { required: true, message: "璇烽�夋嫨璋冨嚭浣嶇疆", trigger: "change" }, + ], + operationTypeId: [ + { required: true, message: "璇烽�夋嫨鍏ュ簱绫诲瀷", trigger: "change" }, + ], + number: [ + { + required: true, + validator: this.validateCheckCode, + trigger: ["change", "blur"], + }, + ], + }, + rules2: { + receiverPhone: [ + // {required: true, message: "璇疯緭鍏ユ墜鏈哄彿", trigger: "change" }, + { + pattern: + /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/, + message: "璇疯緭鍏ユ纭殑鎵嬫満鍙�", + trigger: ["blur", "change"], + }, + ], }, companyOptions: [], // 鍏徃 - memberOptions: [], - fromLocationOptions: [], // 婧愪綅缃� + supplierOptions: [], //渚涘簲鍟� + clientOptions: [], //瀹㈡埛 + memberOptions: [{ id: 1, name: "绠$悊鍛�" }], + personelOptions: [], + formLocationOptions: [], // 鑷� toLocationOptions: [], // 浠撳簱浣嶇疆 - list: [ - { label: "鑽夌", status: "todo" }, - { label: "姝e湪绛夊緟", status: "todo" }, - { label: "灏辩华", status: "todo" }, - { label: "瀹屾垚", status: "todo" } - ], showButton: true, activeName: "first", productTableList: {}, - tableData: [{ name: "ssss" }], - productId: 0, - isNoProduct: false, // 娣诲姞鏄庣粏琛屾椂鏄惁鏈変骇鍝佹湭閫夋嫨 + tableData: [], + countId: 0, + isNoProduct: true, // 娣诲姞鏄庣粏琛屾椂鏄惁鏈変骇鍝佹湭閫夋嫨 showEdit: false, // 鏄惁鏄剧ず缂栬緫鎸夐挳 isDelClick: false, // 鍒犻櫎鎸夐挳鏄惁鍙偣鍑� + isCancel: false, //楠岃瘉鎸夐挳鏄惁鍙偣鍑� showFooter: false, // 鏄惁鏄剧ず鍙栨秷淇濆瓨 currentState: "todo", // 褰撳墠鐘舵�� detailTableList: {}, @@ -308,287 +980,1848 @@ detailId: 0, isNoDetail: false, // 娣诲姞璇︽儏鏄庣粏琛屾椂鏄惁鏈�夋嫨 tableColumn: [], - receiptType: this.addName, // 鍏ュ簱绫诲瀷 + receiptType: "", // 鍏ュ簱绫诲瀷 companyObj: {}, - contacterObj: {} - } + contacterObj: {}, + isValidateClick: false, // 楠岃瘉鏄惁鏄剧ず + operationTypeOptions: [], // 鍏ュ簱绫诲瀷鍒楄〃 + shipmentsInfo: { + carrier: [], + waybillNumber: "", + weight: 0, + logisticWeight: 0, + receiverPhone: "", + }, + showCancel: false, // 鍙栨秷鏄惁鍙互鏄剧ず + list: [], + pdfParams: {}, + thatCursor: this.workType == 3 ? "no-drop" : "pointer", + thatColor: this.workType == 3 ? "#ccc" : "#000", + }; }, created() { - this.setTableForm() - this.setBottonView() - this.setDetailTableForm() - this.activeName = this.workType === 1 ? "first" : "detail" - this.getCompanyList() + this.getCompanyList(); + this.setStatusList(); + this.setTableForm(); + this.setBottonView(); + this.setDetailTableForm(); + //this.querySilkMarket(); + if(this.workType){ + this.getLocationList(); + } + this.queryWareHouse();//鏌ヨ浠撳簱 + this.queryDictList();//鏌ヨ瀛楀吀 涓嬫媺鍒楄〃 + this.queryDictList(6);//鏌ヨ搴勫彛 + //this.queryAllDictList();//琛ㄦ牸 + this.receiptType = + this.editConfig.title == "鏌ョ湅" || this.editConfig.title == "缂栬緫" + ? this.editConfig.infomation.operationTypeName + : this.addName; + if (this.showOperationType) { + this.getListTransfer(); + } + this.getLogisticCompanyList(); + this.formInfo(); + if (this.editConfig.title == "鏌ョ湅" || this.editConfig.title == "缂栬緫") { + setTimeout(() => { + /*this.$refs.tableView.setLocationList( + this.editConfig.infomation.location.label + );*/ + }, 100); + } }, + mounted() {}, methods: { + selectProductArray(val){ + this.productIdArray=val.map(item=>item.id); + }, + deleteItems(){ + if(this.productIdArray.length===0){ + this.$message.warning('璇烽�夋嫨鎮ㄨ鍒犻櫎鐨勪骇鍝�'); + } else{ + this.tableData=this.tableData.filter(item=>!this.productIdArray.includes(item.id)) + this.productTableList.tableData = this.tableData; + this.$message.success("鍒犻櫎鎴愬姛锛�"); + } + }, + changeRelAmount(row){ + if(Array.isArray(row.moreUnitList)){ + row.moreUnitList=row.moreUnitList.map(item=>{ + if(item.floating){ + item.floatingValue=parseFloat(row.relAmount/item.amount); + } + return item; + }) + } + }, + doMoreUnitFormat(moreUnit){ + let moreUnitStr=moreUnit.toString(); + if(moreUnitStr.length>6){ + return moreUnitStr.substring(0,6); + } + return moreUnitStr; + }, + settingDealerType(){ + this.dictModel=true; + this.isSilkMarket=false; + }, + settingSilkMarket(){ + this.dictModel=true; + this.isSilkMarket=true; + }, + selSilkMarket(val){ + this.productTableList.tableData.forEach(item=>{ + item.silkMarket=val; + }) + }, + async querySilkMarket(){ + const {code,data}=await getSilkDictListApi(6); + if(code===200){ + this.silkMarketList=data; + } + }, + selLocationClick(item,prop,index){ + this.tableData.forEach((tItem,i)=>{ + if(index===i){ + tItem[prop]=item; + } + }); + this.productTableList.tableData=JSON.parse(JSON.stringify(this.tableData)); + }, + editDict(row,index){ + const tempList=this.isSilkMarket?this.silkMarketList:this.dictList; + const flag=tempList.some(item=>item.isEdit); + if(!flag){ + this.$set(tempList,index,{...row,isEdit:true}); + }else{ + this.$message.warning("璇峰厛閫�鍑虹紪杈戞ā寮忥紝鍐嶆柊澧�!"); + } + }, + handlerDictClose(){ + this.dictModel=false; + this.keyword=""; + this.queryDictList(this.isSilkMarket?6:0); + }, + cancelDict(){ + this.queryDictList(this.isSilkMarket?6:0); + }, + addDict(){ + const tempList=this.isSilkMarket?this.silkMarketList:this.dictList; + const flag=tempList.some(item=>item.isEdit); + if(!flag){ + let type=parseInt(this.workType); + if(!this.workType){ + type=4; + } + if(this.isSilkMarket){ + type=6;//搴勫彛 鏉愭枡鍦哄湴 + } + tempList.push({name:'',type:type,isEdit:true}); + }else{ + this.$message.warning("璇峰厛閫�鍑虹紪杈戞ā寮忥紝鍐嶆柊澧�!"); + } + }, + deleteDict(id){ + this.$confirm('纭畾瑕佸垹闄ゅ瓧鍏稿悧, 鏄惁缁х画?', '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' + }).then(async () => { + const {code}=await deleteDictApi(id); + if(code===200){ + this.$message.success("鍒犻櫎瀛楀吀鎴愬姛"); + this.queryDictList(this.isSilkMarket?6:0); + }else{ + this.$message.warning("鍒犻櫎瀛楀吀澶辫触"); + } + }).catch(() => {}); + }, + async saveDict(row){ + let request=addDictApi; + if(row.id){//id瀛樺湪鏄紪杈� + request=editDictApi + } + const {code}=await request(row); + if(code===200){ + this.$message.success(row.id?'缂栬緫瀛楀吀鎴愬姛':'娣诲姞瀛楀吀鎴愬姛'); + this.queryDictList(this.isSilkMarket?6:0); + }else{ + this.$message.error(row.id?'缂栬緫瀛楀吀澶辫触':'娣诲姞瀛楀吀澶辫触'); + } + }, + async queryWareHouse(){ + const {code,data}=await getWarehouseList({page:0,pageSize:0,keyword: ""}); + if(code===200){ + this.warehouseList=data; + } + }, + async selWarehouse(val){ + this.tableData=[]; + this.productTableList.tableData=[]; + /*const {code,data}=await getLocationList({ + warehouseId:val, + type:3, + page: 1, + pageSize: 100 + }); + if(code===200){ + this.tableData.forEach(item=>{ + item.fromLocationId=data[0].id; + }); + } + this.$refs.tableView.setLocationList(data, "warehouseCode");*/ + this.warehouseId=val; + }, + //鏌ヨ瀛楀吀鍒楄〃 + async queryDictList(type){ + const params={type:type?type:parseInt(this.workType),keyword:this.keyword}; + if(!this.workType){ + params.type=4; + } + const {code,data} =await getDictListApi(params); + if(code===200){ + if(type){ + this.silkMarketList=data||[]; + this.silkMarketList.map(item=>{ + item.isEdit=false; + }) + }else{ + this.dictList=data||[]; + this.dictList.map(item=>{ + item.isEdit=false; + }) + } + } + }, + //1.鏌ヨ鍏ㄩ儴 + async queryAllDictList(){ + const {code,data} =await getDictListApi({type:0}); + if(code===200){ + this.dictAllList=data||[]; + this.dictAllList.map(item=>{ + item.isEdit=false; + }); + let type=this.workType; + if(!this.workType){ + type=4; + } + this.dictList=this.dictAllList.filter(item=>item.type===type); + } + }, + setFormItem(val, itemMark, itemName) { + this.editConfig.infomation[itemMark] = val.id; + this.editConfig.infomation[itemName] = val.name; + }, + formInfo() { + this.objCode.type ='鐩樼偣缂栫爜' + if(this.workType===1){ + this.objCode.type ='鍏ュ簱缂栫爜' + }else if(this.workType===2){ + this.objCode.type="鍑哄簱缂栫爜"; + }else if (this.workType===3){ + this.objCode.type='璋冩嫧缂栫爜' + } + this.objCode.codeStandID = ""; + if (this.editConfig.infomation.codeStandardID) { + this.objCode.codeStandID = this.editConfig.infomation.codeStandardID; + } + this.getRCodeStandardList(); + }, + setStatusList() { + if (this.editConfig.infomation.status == 5) { + this.list = [ + { label: "鑽夌", status: "todo", value: 1 }, + { label: "姝e湪绛夊緟", status: "todo", value: 2 }, + { label: "灏辩华", status: "todo", value: 3 }, + { label: "瀹屾垚", status: "todo", value: 4 }, + { label: "宸插彇娑�", status: "todo", value: 5 }, + ]; + } else { + this.list = [ + { label: "鑽夌", status: "todo", value: 1 }, + { label: "姝e湪绛夊緟", status: "todo", value: 2 }, + { label: "灏辩华", status: "todo", value: 3 }, + { label: "瀹屾垚", status: "todo", value: 4 }, + ]; + } + }, // 鑾峰彇鍏徃鍒楄〃 async getCompanyList() { - await getCompanyList().then((res) => { - console.log(res) - if (res.data.code === 200) { - this.companyOptions = res.data.data + await getPersonnelList().then((res) => { + if (res.code == 200) { + this.personelOptions = res.data; } - }) + }); + if (this.workType == 1) { + await getSupplierList().then((res) => { + console.log(res); + if (res.code == 200) { + this.supplierOptions = res.data; + } + }); + } else if (this.workType == 2) { + await getClientList().then((res) => { + console.log(res); + if (res.code == 200) { + this.clientOptions = res.data; + } + }); + } else { + await getCompanyList().then((res) => { + if (res.code == 200) { + this.companyOptions = res.data; + } + }); + } + }, + personChange(val, name, id, obj) { + this.editConfig.infomation[obj] = val; + this.editConfig.infomation[name] = val.label; + this.editConfig.infomation[id] = val.value; + }, + // 鑾峰彇璋冨嚭浣嶇疆/浠撳簱浣嶇疆鍒楄〃 + async getLocationList() { + //console.log(this.editConfig.warehouseId); + await getLocationList({ + type:3, + keyWord: "", + warehouseId:parseInt(this.$route.query.warehouseId), + page: 0, + pageSize: 0, + }).then((res) => { + if (res.code == 200) { + this.formLocationOptions = res.data; + this.$refs.tableView.setLocationList(this.formLocationOptions, "fromLocation"); + /*if(Array.isArray(res.data)&&res.data.length>0){ + this.editConfig.infomation.location=res.data[0].id; + }*/ + } + }); + await getLocationList({ + type:3, + keyWord: "", + page: 0, + pageSize: 0, + }).then((res) => { + if (res.code == 200) { + this.toLocationOptions = res.data; + this.$refs.tableView.setLocationList(this.toLocationOptions, "toLocation"); + } + }); + }, + // 鑾峰彇浠撳簱绫诲瀷 + async getListTransfer() { + await getListTransfer({ + keyword: "", + page: 0, + pageSize: 0, + }).then((res) => { + if (res.code == 200) { + const list = res.data.map((item) => { + return { + name: item.name, + id: item.id, + }; + }); + this.operationTypeOptions = list || []; + } + }); }, // 璁剧疆鍒犻櫎/鎵撳嵃/缂栬緫鏄惁鏄剧ず setBottonView() { - if (this.editConfig.title === "鏂板缓") { - this.showButton = false - this.showEdit = false - this.showFooter = true - } else if (this.editConfig.infomation.status === "瀹屾垚") { - this.showButton = true - this.showEdit = false - this.isDelClick = true - this.showFooter = false - } else if (this.editConfig.infomation.status === "宸插彇娑�") { - this.showButton = true - this.showEdit = false - this.showFooter = false + if (this.editConfig.title == "鏂板缓") { + this.showButton = false; + this.showEdit = false; + this.showFooter = true; + this.isValidateClick = false; + } else if (this.editConfig.title == "缂栬緫") { + this.showButton = true; + this.showEdit = false; + this.isDelClick = true; + this.showFooter = true; + } else if ( + this.editConfig.title == "鏌ョ湅" && + this.editConfig.infomation.status !== 4 + ) { + this.showButton = true; + this.showEdit = true; + this.isDelClick = true; + this.showFooter = false; + if (this.editConfig.infomation.status == "瀹屾垚") { + this.isValidateClick = false; + } else if (this.editConfig.infomation.status == 3) { + this.isValidateClick = true; + this.showCancel = true; + } else if (this.editConfig.infomation.status == 5) { + this.isCancel = true; + this.isValidateClick = true; + } else { + this.isValidateClick = true; + } + } else if ( + this.editConfig.infomation.status == 4 || + this.editConfig.infomation.status == "瀹屾垚" + ) { + this.showButton = true; + this.showEdit = false; + this.isDelClick = true; + this.showFooter = false; + this.isValidateClick = false; + } else if (this.editConfig.infomation.status == 5) { + this.isCancel = true; + this.showButton = true; + this.showEdit = false; + this.showFooter = false; + this.isValidateClick = false; } else { - this.showButton = true - this.showEdit = true - this.showFooter = false + // 灏辩华--- + this.showButton = true; + this.showEdit = true; + this.showFooter = false; + this.isValidateClick = true; + this.showCancel = true; } - if (this.editConfig.title === "鏂板缓") { - this.list[0].status = "active" + if (this.editConfig.title == "鏂板缓") { + this.list[0].status = "active"; } else { this.list.map((item) => { - if (item.label === this.editConfig.infomation.status) { - item.status = "active" + console.log(item, this.editConfig.infomation.status, "鎵撳嵃淇℃伅"); + if ( + item.value == this.editConfig.infomation.status || + item.label == this.editConfig.infomation.status + ) { + item.status = "active"; } else { - item.status = "todo" + item.status = "todo"; } - }) + }); } }, // 鍏抽棴 handleClose() { - this.editConfig.visible = false + this.editConfig.visible = false; }, // 缂栬緫 editClick() { - this.showEdit = false - this.showButton = false - this.showFooter = true - this.setTableForm() + this.showEdit = false; + this.showButton = false; + this.showFooter = true; + this.setTableForm(); + }, + async getLogisticCompanyList() { + await getLogisticCompanyList().then((res) => { + if (res.code == 200) { + this.editConfig.infomation.carrier = res.data; + } + }); + }, + calcMoreUnitAmount(item ={ moreUnitList:[] } ){ + (item.moreUnitList||[]).forEach(moreUnitItem=>{ + if(!moreUnitItem.floating){ + moreUnitItem.amount=this.doMoreUnitFormat(parseFloat(item.relAmount/moreUnitItem.amount)); + }else{ + moreUnitItem.amount=moreUnitItem.floatingValue; + } + }); }, // 淇濆瓨 saveClick() { - this.saveParams() + let validArr = []; + if (this.workType == 2) { + validArr = [this.$refs.form.validate()]; + } else { + validArr = [this.$refs.form.validate()]; + } + Promise.all(validArr) + .then((results) => { + for (let i = 0; i < this.tableData.length; i++) { + if (this.tableData[i].productName.length == 0) { + this.isNoProduct = true; + break; + } else { + this.isNoProduct = false; + } + } + if (this.isNoProduct) { + this.$message.error("璇锋坊鍔犳槑缁嗚鎴栭�夋嫨浜у搧涓嶈兘涓虹┖"); + } else { + let params =JSON.parse(JSON.stringify(this.settingParams())); + let isContinue=false; + // if(this.workType==2){ + // params.details.map((item)=>{ + // item.fromLocationId=item.fromLocationId.value + // }) + // }else if(this.workType==3){ + // params.details.map((item)=>{ + // item.fromLocationId=item.fromLocationId.value + // item.toLocationId=item.toLocationId.value + // }) + // } + // 浜у搧鍒楄〃瑙f瀯 + if ( + this.editConfig.title == "缂栬緫" || + this.editConfig.title == "鏌ョ湅" + ) { + let arr = []; + if (this.workType == 1) { + params.details.map((item) => { + /* (item.moreUnitList||[]).forEach(moreUnitItem=>{ + if(!moreUnitItem.floating){ + moreUnitItem.amount=this.doMoreUnitFormat(parseFloat(item.relAmount/moreUnitItem.amount)); + } + });*/ + this.calcMoreUnitAmount(item); + const obj={ + operationId: item.operationId, + amount: item.relAmount, + fromLocationId: item.fromLocationId, + toLocationId:item.toLocationId, + productId: item.productId, + auxiliaryUnit:item.auxiliaryUnit, + auxiliaryAmount:item.auxiliaryAmount, + totalNetWeight:item.totalNetWeight, + totalGrossWeight:item.totalGrossWeight, + cost:item.cost, + salePrice:item.salePrice, + remark:item.remark, + silkMarket:item.silkMarket||"", + silkMarketClose:item.silkMarketClose, + moreUnitList:item.moreUnitList + }; + arr.push(obj); + }); + params.details = arr; + } else if (this.workType == 2) { + params.details.map((item) => { + /*(item.moreUnitList||[]).forEach(moreUnitItem=>{ + if(!moreUnitItem.floating){ + moreUnitItem.amount=this.doMoreUnitFormat(parseFloat(item.relAmount/moreUnitItem.amount)); + } + });*/ + this.calcMoreUnitAmount(item); + const obj ={ + operationId: item.operationId, + fromLocationId: item.fromLocation.id, + productId: item.productId, + auxiliaryUnit:item.auxiliaryUnit, + auxiliaryAmount:item.auxiliaryAmount, + totalNetWeight:item.totalNetWeight, + totalGrossWeight:item.totalGrossWeight, + cost:item.cost, + salePrice:item.salePrice, + remark:item.remark, + silkMarket:item.silkMarket||"", + silkMarketClose:item.silkMarketClose, + moreUnitList:item.moreUnitList + } + obj.stockAmount=item.amount; + obj.amount=item.relAmount; + arr.push(obj); + }); + params.details = arr; + } else if (this.workType == 3) { + let flag=params.details.some(item=>item.relAmount>item.amount); + if(flag){ + this.$message.warning('璋冩嫧鏁伴噺涓嶈兘瓒呰繃鍦ㄧ嚎搴撳瓨'); + return; + } + flag=params.details.some(item=>item.toLocationId===item.fromLocation.id); + if(flag){ + this.$message.warning('涓嶅厑璁镐粠褰撳墠浠撳簱璋冩嫧鍒板綋鍓嶄粨搴�'); + return; + } + params.details.map((item) => { + /* (item.moreUnitList||[]).forEach(moreUnitItem=>{ + if(!moreUnitItem.floating){ + moreUnitItem.amount=this.doMoreUnitFormat(parseFloat(item.relAmount/moreUnitItem.amount)); + } + });*/ + this.calcMoreUnitAmount(item); + const obj={ + operationId: item.operationId, + fromLocationId: item.fromLocation.id, + toLocationId: item.toLocationId, + productId: item.productId, + auxiliaryUnit:item.auxiliaryUnit, + auxiliaryAmount:item.auxiliaryAmount, + totalNetWeight:item.totalNetWeight, + totalGrossWeight:item.totalGrossWeight, + cost:item.cost, + salePrice:item.salePrice, + remark:item.remark, + silkMarket:item.silkMarket||"", + silkMarketClose:item.silkMarketClose, + moreUnitList:item.moreUnitList + }; + obj.stockAmount=item.amount; + obj.amount=item.relAmount; + arr.push(obj); + // if(item.fromLocationId.value){ + // arr.push({ + // operationId:item.operationId, + // amount:item.amount, + // fromLocationId:item.fromLocationId.value, + // toLocationId:item.toLocation.id, + // productId:item.productId, + // }) + // }else{ + // arr.push({ + // operationId:item.operationId, + // amount:item.amount, + // fromLocationId:item.fromLocation.id, + // toLocationId:item.toLocation.id, + // productId:item.productId, + // }) + // } + }); + params.details = arr; + }else if(!this.workType){//鐩樼偣鏃犱笟鍔$被鍨� + params.details.map((item) => { + /*(item.moreUnitList||[]).forEach(moreUnitItem=>{ + if(!moreUnitItem.floating){ + moreUnitItem.amount=this.doMoreUnitFormat(parseFloat(item.relAmount/moreUnitItem.amount)); + } + });*/ + this.calcMoreUnitAmount(item); + const obj = { + operationId: item.operationId, + fromLocationId: item.fromLocation.id, + toLocationId: item.toLocationId||0, + productId: item.productId, + auxiliaryUnit:item.auxiliaryUnit, + auxiliaryAmount:item.auxiliaryAmount, + totalNetWeight:item.totalNetWeight, + totalGrossWeight:item.totalGrossWeight, + cost:item.cost, + salePrice:item.salePrice, + remark:item.remark, + silkMarket:item.silkMarket||"", + silkMarketClose:item.silkMarketClose, + moreUnitList:item.moreUnitList + }; + obj.stockAmount=item.amount; + obj.amount=item.relAmount; + arr.push(obj); + }); + params.details = arr; + } + } else if (this.editConfig.title == "鏂板缓") { + if (this.workType == 2||this.workType==1||!this.workType) { + params.details.map((item) => { + /* (item.moreUnitList||[]).forEach(moreUnitItem=>{ + if(!moreUnitItem.floating){ + moreUnitItem.amount=this.doMoreUnitFormat(parseFloat(item.relAmount/moreUnitItem.amount)); + } + });*/ + this.calcMoreUnitAmount(item); + if(!this.workType){ + item.toLocationId=item.location.id; + }else{ + item.toLocationId=item.toLocationId||0; + } + if(this.workType!=1){ + item.fromLocationId=item.location.id; + } + if(this.workType!=1){ + item.stockAmount=item.amount; + item.amount=item.relAmount; + }else{ + item.amount=item.relAmount; + } + item.silkMarket=item.silkMarket||this.editConfig.infomation.silkMarket?this.editConfig.infomation.silkMarket:''; + item.silkMarketClose=item.silkMarketClose||'鍚�'; + }); + } else if (this.workType == 3) { + let flag=params.details.some(item=>item.relAmount>item.amount); + if(flag){ + this.$message.warning('璋冩嫧鏁伴噺涓嶈兘瓒呰繃鍦ㄧ嚎搴撳瓨'); + return; + } + flag=params.details.some(item=>item.toLocationId===item.location.id); + if(flag){ + this.$message.warning('涓嶅厑璁镐粠褰撳墠浠撳簱璋冩嫧鍒板綋鍓嶄粨搴�'); + return; + } + params.details.map((item) => { + /* (item.moreUnitList||[]).forEach(moreUnitItem=>{ + if(!moreUnitItem.floating){ + moreUnitItem.amount=this.doMoreUnitFormat(parseFloat(item.relAmount/moreUnitItem.amount)); + } + });*/ + this.calcMoreUnitAmount(item); + item.fromLocationId = item.location.id; + item.stockAmount=item.amount; + item.amount=item.relAmount; + + if(!item.fromLocationId||!item.toLocationId){ + isContinue=true + return true + } + }); + } + if(isContinue){ + this.$message.error('璇峰~鍐欏畬鎴愯〃鏍硷紒') + return true; + } + } + let requestUrl = + this.editConfig.title == "鏂板缓" ? addOperation : updateOperation; + requestUrl({ + ...params, + }).then((res) => { + this.editConfig.visible = false; + if (res.code == 200) { + if (this.editConfig.title == "鏂板缓") { + this.$message.success("娣诲姞鎴愬姛"); + } else { + this.$message.success("缂栬緫鎴愬姛"); + } + this.$parent.getData(); + } else { + this.$message.success(res.msg); + } + }); + } + }) + .catch((error) => { + console.error("琛ㄥ崟鏍¢獙鏈�氳繃:", error); + }); + }, + settingParams(){ + let data = this.editConfig.infomation; + let companyID = ''; + let companyName = ""; + let contacterID = ''; + let contacterName = ""; + if (this.editConfig.title == "鏂板缓") { + companyID = + Object.keys(this.companyObj).length == 0 ? '' : this.companyObj.value; + companyName = + Object.keys(this.companyObj).length == 0 + ? "" + : this.companyObj.label; + contacterID = + Object.keys(this.contacterObj).length == 0 + ? 0 + : this.contacterObj.value; + contacterName = + Object.keys(this.contacterObj).length == 0 + ? "" + : this.contacterObj.label; + } else { + companyID = + Object.keys(this.companyObj).length == 0 + ? data.companyID + : this.companyObj.value; + companyName = + Object.keys(this.companyObj).length == 0 + ? data.companyName + : this.companyObj.label; + contacterID = + Object.keys(this.contacterObj).length == 0 + ? data.contacterID + : this.contacterObj.value; + contacterName = + Object.keys(this.contacterObj).length == 0 + ? data.contacterName + : this.contacterObj.label; + } + let params = {}; + if (this.workType == 1 || this.workType == 2) { + params = { + baseOperationType: data.baseOperationType, + comment: data.comment || "", + companyID: companyID+'', + companyName: companyName, + contacterID: contacterID, + contacterName: contacterName, + details: this.productTableList.tableData, + locationId: data.location || 0, + id: data.id, + number: data.number || "", + operationDate: data.operationDate || "", + operationTypeId: this.showOperationType + ? data.operationTypeId + : this.editConfig.operationTypeId, + operationTypeName: this.receiptType, + sourceNumber: data.sourceNumber || "", + status: 3, + // toLocationId: data.toLocation.value||0, + waybillNumber: data.waybillNumber || "", + weight: data.weight || 0, + logisticWeight: data.logisticWeight || 0, + logisticCompanyId: data.logisticCompanyId, + receiverAddr: data.receiverAddr || "", + receiverName: data.receiverName || "", + receiverPhone: data.receiverPhone || "", + manager: data.manager || "", + managerId: data.managerId || "", + accountant: data.accountant || "", + accountantId: data.accountantId || "", + custodian: data.custodian || "", + custodianId: data.custodianId || "", + dealerType:data.dealerType||"" + }; + if(this.workType==1){ + params.toLocationId=data.location || 0; + } + } else if (this.workType == 3) { + params = { + baseOperationType: data.baseOperationType, + comment: data.comment || "", + companyID: companyID+'', + companyName: companyName, + contacterID: contacterID, + contacterName: contacterName, + details:this.productTableList.tableData, + locationId: data.location || 0, + id: data.id, + number: data.number || "", + operationDate: data.operationDate || "", + operationTypeId: this.showOperationType + ? data.operationTypeId + : this.editConfig.operationTypeId, + operationTypeName: this.receiptType, + sourceNumber: data.sourceNumber || "", + status: 3, + toLocationId: data.toLocation || 0, + waybillNumber: data.waybillNumber || "", + weight: data.weight || 0, + logisticWeight: data.logisticWeight || 0, + logisticCompanyId: data.logisticCompanyId, + receiverAddr: data.receiverAddr || "", + receiverName: data.receiverName || "", + receiverPhone: data.receiverPhone || "", + manager: data.manager || "", + managerId: data.managerId || "", + accountant: data.accountant || "", + accountantId: data.accountantId || "", + custodian: data.custodian || "", + custodianId: data.custodianId || "", + dealerType:data.dealerType||"" + }; + }else if(!this.workType){ + params = { + baseOperationType:5, + comment: data.comment || "", + companyID: companyID+'', + companyName: companyName, + contacterID: contacterID, + contacterName: contacterName, + details: this.productTableList.tableData, + // locationId: data.location.value || 0, + id: data.id, + number: data.number || "", + operationDate: data.operationDate || "", + operationTypeId: this.showOperationType + ? data.operationTypeId + : this.editConfig.operationTypeId, + operationTypeName: this.receiptType, + sourceNumber: data.sourceNumber || "", + status: 3, + // toLocationId: data.toLocation.value||0, + waybillNumber: data.waybillNumber || "", + weight: data.weight || 0, + logisticWeight: data.logisticWeight || 0, + logisticCompanyId: data.logisticCompanyId, + receiverAddr: data.receiverAddr || "", + receiverName: data.receiverName || "", + receiverPhone: data.receiverPhone || "", + manager: data.manager || "", + managerId: data.managerId || "", + accountant: data.accountant || "", + accountantId: data.accountantId || "", + custodian: data.custodian || "", + custodianId: data.custodianId || "", + warehouseId:data.warehouseId ||"", + dealerType:data.dealerType||"" + }; + } + if(this.$route.query.warehouseId){ + params.warehouseId=parseInt(this.$route.query.warehouseId); + } + params.silkMarket=data.silkMarket||""; + return params; }, saveParams() { - let data = this.editConfig.infomation - console.log(this.companyObj) - let params = { - companyID: data.company.value || 0, - companyName: data.company.label || "", - contacterID: 0, - contacterName: "string", - details: [ - { - finishQuantity: 0, - productId: 0, - productName: "string", - quantity: 0 - } - ], - fromLocationId: data.fromLocationId || 0, - id: 0, - number: "", - operationDate: data.operationDate || "", - operationTypeId: data.operationTypeId, - sourceNumber: data.sourceNumber || "", - status: 3, - toLocationId: data.toLocationId || 0 + let data = this.editConfig.infomation; + let companyID = ''; + let companyName = ""; + let contacterID = ''; + let contacterName = ""; + if (this.editConfig.title == "鏂板缓") { + companyID = + Object.keys(this.companyObj).length == 0 ? '' : this.companyObj.value; + companyName = + Object.keys(this.companyObj).length == 0 + ? "" + : this.companyObj.label; + contacterID = + Object.keys(this.contacterObj).length == 0 + ? 0 + : this.contacterObj.value; + contacterName = + Object.keys(this.contacterObj).length == 0 + ? "" + : this.contacterObj.label; + } else { + companyID = + Object.keys(this.companyObj).length == 0 + ? data.companyID + : this.companyObj.value; + companyName = + Object.keys(this.companyObj).length == 0 + ? data.companyName + : this.companyObj.label; + contacterID = + Object.keys(this.contacterObj).length == 0 + ? data.contacterID + : this.contacterObj.value; + contacterName = + Object.keys(this.contacterObj).length == 0 + ? data.contacterName + : this.contacterObj.label; } - return params + let params = {}; + if (this.workType == 1 || this.workType == 2) { + params = { + baseOperationType: data.baseOperationType, + comment: data.comment || "", + companyID: companyID+'', + companyName: companyName, + contacterID: contacterID, + contacterName: contacterName, + details: this.tableData, + locationId: data.location || 0, + id: data.id, + number: data.number || "", + operationDate: data.operationDate || "", + operationTypeId: this.showOperationType + ? data.operationTypeId + : this.editConfig.operationTypeId, + operationTypeName: this.receiptType, + sourceNumber: data.sourceNumber || "", + status: 3, + // toLocationId: data.toLocation.value||0, + waybillNumber: data.waybillNumber || "", + weight: data.weight || 0, + logisticWeight: data.logisticWeight || 0, + logisticCompanyId: data.logisticCompanyId, + receiverAddr: data.receiverAddr || "", + receiverName: data.receiverName || "", + receiverPhone: data.receiverPhone || "", + manager: data.manager || "", + managerId: data.managerId || "", + accountant: data.accountant || "", + accountantId: data.accountantId || "", + custodian: data.custodian || "", + custodianId: data.custodianId || "", + inventoryDealerType:data.inventoryDealerType||0 + }; + if(this.workType==1){ + params.toLocationId=data.location || 0; + } + } else if (this.workType == 3) { + params = { + baseOperationType: data.baseOperationType, + comment: data.comment || "", + companyID: companyID+'', + companyName: companyName, + contacterID: contacterID, + contacterName: contacterName, + details: this.tableData, + locationId: data.location|| 0, + id: data.id, + number: data.number || "", + operationDate: data.operationDate || "", + operationTypeId: this.showOperationType + ? data.operationTypeId + : this.editConfig.operationTypeId, + operationTypeName: this.receiptType, + sourceNumber: data.sourceNumber || "", + status: 3, + toLocationId: data.toLocation || 0, + waybillNumber: data.waybillNumber || "", + weight: data.weight || 0, + logisticWeight: data.logisticWeight || 0, + logisticCompanyId: data.logisticCompanyId, + receiverAddr: data.receiverAddr || "", + receiverName: data.receiverName || "", + receiverPhone: data.receiverPhone || "", + manager: data.manager || "", + managerId: data.managerId || "", + accountant: data.accountant || "", + accountantId: data.accountantId || "", + custodian: data.custodian || "", + custodianId: data.custodianId || "", + inventoryDealerType:data.inventoryDealerType||0 + }; + }else if(!this.workType){ + params = { + baseOperationType:5, + comment: data.comment || "", + companyID: companyID+'', + companyName: companyName, + contacterID: contacterID, + contacterName: contacterName, + details: this.tableData, + // locationId: data.location.value || 0, + id: data.id, + number: data.number || "", + operationDate: data.operationDate || "", + operationTypeId: this.showOperationType + ? data.operationTypeId + : this.editConfig.operationTypeId, + operationTypeName: this.receiptType, + sourceNumber: data.sourceNumber || "", + status: 3, + // toLocationId: data.toLocation.value||0, + waybillNumber: data.waybillNumber || "", + weight: data.weight || 0, + logisticWeight: data.logisticWeight || 0, + logisticCompanyId: data.logisticCompanyId, + receiverAddr: data.receiverAddr || "", + receiverName: data.receiverName || "", + receiverPhone: data.receiverPhone || "", + manager: data.manager || "", + managerId: data.managerId || "", + accountant: data.accountant || "", + accountantId: data.accountantId || "", + custodian: data.custodian || "", + custodianId: data.custodianId || "", + warehouseId:data.warehouseId ||"", + inventoryDealerType:data.inventoryDealerType||0 + }; + } + return params; }, // 鍒犻櫎 - delClick() {}, + async delClick() { + await deleteOperation(this.editConfig.infomation.id).then((res) => { + console.log(res); + this.editConfig.visible = false; + if (res.code == 200) { + this.$message.success("鍒犻櫎鎴愬姛"); + this.$parent.getData(); + } + }); + }, // 鎿嶄綔鍒楄〃 setTableForm() { + if ( + this.editConfig.title !== "鏂板缓" && + this.editConfig.infomation.details && + this.editConfig.infomation.details.length > 0 + ) { + const list= this.getTwoTable(this.editConfig.infomation.details,'1') + this.tableData = list; + } else { + this.tableData = []; + } + // this.tableData = this.editConfig.title !== "鏂板缓" ? list : [] + let tableColumnArr = []; + if (this.workType == 1) { + tableColumnArr = [ + { + label: "浜у搧鍚嶇О", + prop: "productName", + min:150, + productName: true, + isRequird: true, + isScanCode:true, + }, + { label: "浜у搧缂栫爜", prop: "productId" }, + { label: "浜у搧瑙勬牸", prop: "specs" }, + { label: "浜у搧鍨嬪彿", prop: "model" }, + { + label: "浠撳簱浣嶇疆", + prop: "toLocationId", + sonLocation: true, + min:140, + isRequird: true, + }, + /*{ label: "鏁伴噺", prop: "relAmount", inputFloat: true },*/ + { label: "璁¢噺鍗曚綅", prop: "unit" }, + /*{ label: "杈呭姪鏁伴噺", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' }, + { label: "杈呭姪鍗曚綅", prop: "auxiliaryUnit" },*/ + /*{ label: "姣涢噸", prop: "grossWeight" }, + { label: "鎬绘瘺閲�", prop: "totalGrossWeight" }, + { label: "鍑�閲�", prop: "netWeight" }, + { label: "鎬诲噣閲�", prop: "totalNetWeight" }*/ + ]; + } else if (this.workType == 2) { + tableColumnArr = [ + { + label: "浜у搧鍚嶇О", + prop: "productName", + min:150, + productName: true, + isRequird: true, + isScanCode:true, + }, + { label: "浜у搧缂栫爜", prop: "productId" }, + { label: "浜у搧瑙勬牸", prop: "specs" }, + { label: "浜у搧鍨嬪彿", prop: "model" }, + { + label: "浠�", + prop: "fromLocationId", + min:120, + /* sonLocation: true,*/ + isRequird: true, + }, + { label: "鍦ㄥ簱鏁伴噺", prop: "amount" }, + /*{ label: "鏁伴噺", prop: "relAmount", inputFloat: true },*/ + { label: "璁¢噺鍗曚綅", prop: "unit" }, + /*{ label: "杈呭姪鏁伴噺", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' }, + { label: "杈呭姪鍗曚綅", prop: "auxiliaryUnit" },*/ + /*{ label: "姣涢噸", prop: "grossWeight" }, + { label: "鎬绘瘺閲�", prop: "totalGrossWeight" }, + { label: "鍑�閲�", prop: "netWeight" }, + { label: "鎬诲噣閲�", prop: "totalNetWeight" }*/ + ]; + } else if (this.workType == 3) { + tableColumnArr = [ + { + label: "浜у搧鍚嶇О", + prop: "productName", + min:150, + productName: true, + isRequird: true, + isScanCode:true, + }, + { label: "浜у搧缂栫爜", prop: "productId" }, + { label: "浜у搧瑙勬牸", prop: "specs" }, + { label: "浜у搧鍨嬪彿", prop: "model" }, + { + label: "浠�", + prop: "fromLocationId", + /*sonLocation: true,*/ + min:120, + isRequird: true, + }, + { + label: "鑷�", + prop: "toLocationId", + min:120, + toLocation: true, + isRequird: true, + }, + { label: "鍦ㄥ簱鏁伴噺", prop: "amount" }, + /*{ label: "鏁伴噺", prop: "relAmount", inputFloat: true },*/ + { label: "璁¢噺鍗曚綅", prop: "unit" }, + /*{ label: "杈呭姪鏁伴噺", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' }, + { label: "杈呭姪鍗曚綅", prop: "auxiliaryUnit" },*/ + /* { label: "姣涢噸", prop: "grossWeight" }, + { label: "鎬绘瘺閲�", prop: "totalGrossWeight" }, + { label: "鍑�閲�", prop: "netWeight" }, + { label: "鎬诲噣閲�", prop: "totalNetWeight" }*/ + ]; + } else if (this.workType == 4) { + tableColumnArr = [ + { + label: "浜у搧鍚嶇О", + prop: "productName", + min:150, + productName: true, + isRequird: true, + isScanCode:true, + }, + { label: "浜у搧缂栫爜", prop: "productId" }, + { label: "浜у搧瑙勬牸", prop: "specs" }, + { label: "浜у搧鍨嬪彿", prop: "model" }, + { + label: "浠�", + prop: "fromLocationId", + min:120, + sonLocation: true, + isRequird: true, + }, + { + label: "鑷�", + prop: "toLocationId", + toLocation: true, + isRequird: true, + }, + /*{ label: "鏁伴噺", prop: "amount", inputFloat: true },*/ + { label: "璁¢噺鍗曚綅", prop: "unit" }, + ]; + } else if (this.workType == 5) { + tableColumnArr = [ + { + label: "浜у搧鍚嶇О", + prop: "productName", + min:150, + productName: true, + isRequird: true, + isScanCode:true, + }, + { label: "浜у搧缂栫爜", prop: "productId" }, + { label: "浜у搧瑙勬牸", prop: "specs" }, + { label: "浜у搧鍨嬪彿", prop: "model" }, + { + label: "浠�", + prop: "fromLocationId", + min:120, + sonLocation: true, + isRequird: true, + }, + { + label: "鑷�", + prop: "toLocationId", + toLocation: true, + isRequird: true, + }, + /*{ label: "鏁伴噺", prop: "amount", inputFloat: true },*/ + { label: "璁¢噺鍗曚綅", prop: "unit" }, + ]; + }else{ + tableColumnArr = [ + { + label: "浜у搧鍚嶇О", + prop: "productName", + min:150, + productName: true, + isRequird: true, + isScanCode:true, + }, + { label: "浜у搧缂栫爜", prop: "productId" }, + { label: "浜у搧瑙勬牸", prop: "specs" }, + { label: "浜у搧鍨嬪彿", prop: "model" }, + { + label: "浣嶇疆", + prop: "fromLocationId", + /*sonLocation: true,*/ + min:120, + isRequird: true, + }, + /*{ label: "鐩樼偣鏁伴噺", prop: "relAmount", inputFloat: true ,min:0},*/ + { label: "搴撳瓨鏁伴噺", prop: "amount" }, + { label: "璁¢噺鍗曚綅", prop: "unit" }, + /*{ label: "杈呭姪鏁伴噺", prop: "auxiliaryAmount",inputFloatValue:true,isInputFloat:'inputFloatAuxiliaryAmount' }, + { label: "杈呭姪鍗曚綅", prop: "auxiliaryUnit" },*/ + /*{ label: "姣涢噸", prop: "grossWeight" }, + { label: "鎬绘瘺閲�", prop: "totalGrossWeight" }, + { label: "鍑�閲�", prop: "netWeight" }, + { label: "鎬诲噣閲�", prop: "totalNetWeight" }*/ + ]; + } + //console.log(this.tableData,'===tableData') + if(this.workType == 2){ + for(let i in this.tableData){ + this.selSonLocationClick(this.tableData[i].fromLocation.id,'fromLocationId',this.tableData[i],i,3) + } + } this.productTableList = { tableData: this.tableData, - tableColumn: [ - { label: "浜у搧", prop: "name", productName: true, isRequird: true }, - // { label: "璇存槑", prop: "number", input: true }, - // { label: "鏃ユ湡", prop: "amount", date: true, isRequird: true }, - // { label: "鎴鏃ユ湡", prop: "price", date: true }, - { label: "瀹屾垚", prop: "total", inputFloat: true }, - { label: "璁¢噺鍗曚綅", prop: "total", select: true } - ] - } + tableColumn: tableColumnArr, + selectBox:true + }; + + }, + getTwoTable(data,value){ + let list = data.map((res) => { + let adjunctUnit='' + let adjunctAmount='' + let isValue=false + let moreUnit=null + let moreUnitList=[] + if(value==1){ + moreUnit=res.product.moreUnit; + moreUnitList=res.product.moreUnitList + }else{ + moreUnit=res.moreUnit + moreUnitList=res.moreUnitList; + } + if(moreUnit&&moreUnitList){ + if(moreUnitList.length>0){ + for(let j in moreUnitList){ + if(moreUnitList[j].floating){ + isValue=true; + adjunctUnit=moreUnitList[j].unit + adjunctAmount=moreUnitList[j].amount + break; + } + } + if(!isValue){ + for(let j in moreUnitList){ + if(moreUnitList[j].unit){ + adjunctUnit=moreUnitList[j].unit + adjunctAmount=moreUnitList[j].amount + break; + } + } + } + } + } + if(value==1){ + const moreUnitList=[]; + if(Array.isArray(res.moreUnitList)){ + res.moreUnitList.forEach(item=>{ + if(item.floating){ + item.floatingValue=item.amount; + moreUnitList.push(item); + } + }); + } + if(Array.isArray(res.product.moreUnitList)){ + res.product.moreUnitList.forEach((item,index)=>{ + if(!item.floating){ + moreUnitList.push(item); + }else{ + let obj={...moreUnitList[index]} + obj.amount=item.amount; + this.$set(moreUnitList,index,obj); + } + }) + } + return { + ...res, + productName: res.product?res.product.name:res.name, + productId: res.product.id, + unit: res.product.unit, + model:res.product.model, + specs:res.product.specs, + moreUnit:res.product.moreUnit, + moreUnitList, + //moreUnitList:res.product.moreUnitList, + auxiliaryUnit:res.auxiliaryUnit, + // auxiliaryAmount:res.amount&&adjunctAmount?Number(adjunctAmount)*Number(res.amount):0, + auxiliaryAmount:res.auxiliaryAmount, + auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0, + inputFloatAuxiliaryAmount:isValue, + grossWeight:res.product.grossWeight==0?null:res.product.grossWeight, + totalGrossWeight:res.totalGrossWeight==0?null:Number(res.totalGrossWeight), + netWeight:res.product.netWeight==0?null:res.product.netWeight, + totalNetWeight:res.totalNetWeight==0?null:Number(res.totalNetWeight), + }; + }else{ + return { + ...res, + productName: res.productId?(res.productName?res.productName:res.name):res.name, + productId: res.productId?res.productId:res.id, + auxiliaryUnit:adjunctUnit, + auxiliaryAmount:adjunctAmount?(1/Number(adjunctAmount)).toFixed(2):0, + auxiliaryAmountInfo:adjunctAmount?Number(adjunctAmount):0, + inputFloatAuxiliaryAmount:isValue, + grossWeight:res.grossWeight==0?null:res.grossWeight, + totalGrossWeight:res.grossWeight==0?null:Number(res.grossWeight)*1, + netWeight:res.netWeight==0?null:res.netWeight, + totalNetWeight:res.netWeight==0?null:Number(res.netWeight)*1, + }; + } + }); + console.log(list,'-------') + return list||[]; + }, + getAuxiligyAmount(unit,unitList){ + let adjunctUnit='' + let adjunctAmount='' + let isValue=false + let moreUnit=unit?unit:'' + let moreUnitList=unitList?unitList:[] + if(moreUnit&&moreUnitList){ + if(moreUnitList.length>0){ + for(let j in moreUnitList){ + if(moreUnitList[j].floating){ + isValue=true; + adjunctUnit=moreUnitList[j].unit + adjunctAmount=moreUnitList[j].amount + break; + } + } + if(!isValue){ + for(let j in moreUnitList){ + if(moreUnitList[j].unit){ + adjunctUnit=moreUnitList[j].unit + adjunctAmount=moreUnitList[j].amount + break; + } + } + } + } + } + return { + auxiliaryAmount:adjunctAmount, + auxiliaryUnit:adjunctUnit, + } }, // 鎿嶄綔杈撳叆 inputContent(val, prop, row) { - this.productId = row.productId + this.countId = row.countId; this.tableData.map((item) => { - if (item.productId === row.productId) { - item[prop] = val + if (item.id == row.id) { + item[prop] = val; + let auxiliaryAmountObject=this.getAuxiligyAmount(item.moreUnit,item.moreUnitList) + if(prop=='amount'){ + item.totalGrossWeight=item[prop]&&item.grossWeight?Number(item.grossWeight)*Number(item[prop]):null + item.totalNetWeight=item[prop]&&item.netWeight?Number(item.netWeight)*Number(item[prop]):null + item.auxiliaryAmount=item[prop]&&auxiliaryAmountObject.auxiliaryAmount?(Number(item[prop])/Number(auxiliaryAmountObject.auxiliaryAmount)).toFixed(2):null + } } - }) + }); }, - // 鏂板 - addProductClick(value) { - if (value === "鎿嶄綔") { - console.log(this.tableData) - for (let i = 0; i < this.tableData.length; i++) { - if (this.tableData[i].name.length === 0) { - this.isNoProduct = true - break - } else { - this.isNoProduct = false - } - } - if (!this.isNoProduct) { - this.productId++ - this.tableData.push({ - productId: this.productId, - id: 0, - amount: 0, - desc: "", - name: "", - number: "", - price: 0, - total: 0 - }) - } - } else { - console.log(this.detailTableData) - for (let i = 0; i < this.detailTableData.length; i++) { - if (this.detailTableData[i].name.length === 0) { - this.isNoDetail = true - break - } else { - this.isNoDetail = false - } - } - if (!this.isNoDetail) { - this.detailId++ - this.detailTableData.push({ - detailId: this.detailId, - id: 0, - amount: 0, - desc: "", - name: "", - number: "", - price: 0, - total: 0 + selSonLocationClick(val, prop, row,scope,type){ + if(this.workType == 2){ + if(prop=='fromLocationId'){ + getLocationProductAmount({ + locationId:type==3?val:val.value, + productId:row.productId + }).then((res)=>{ + if(res.code==200){ + if(type==3){ + this.$set(this.tableData[scope],'inLibraryAmount',res.data?res.data.amount:0) + }else{ + this.$set(this.tableData[scope.$index],'inLibraryAmount',res.data?res.data.amount:0) + } + this.$forceUpdate() + } }) } } }, + // 鏂板 + addProductClick(value) { + console.log(value); + // if (value == "鎿嶄綔") { + // console.log(this.tableData) + // for (let i = 0; i < this.tableData.length; i++) { + // if (this.tableData[i].productName.length == 0) { + // this.isNoProduct = false + // break + // } else { + // this.isNoProduct = true + // } + // } + // if (this.isNoProduct) { + // this.countId++ + // this.tableData.push({ + // countId: this.countId, + // productId: "", + // amount: 0, + // unit: "", + // productName: "" + // }) + // } + // } else { + // console.log(this.detailTableData) + // for (let i = 0; i < this.detailTableData.length; i++) { + // if (this.detailTableData[i].name.length == 0) { + // this.isNoDetail = true + // break + // } else { + // this.isNoDetail = false + // } + // } + // if (!this.isNoDetail) { + // this.detailId++ + // this.detailTableData.push({ + // detailId: this.detailId, + // id: 0, + // amount: 0, + // desc: "", + // name: "", + // number: "", + // price: 0, + // total: 0 + // }) + // } + // } + }, + selProductClick(value, prop,row,scope){ + this.getSelectArray([value],scope.$index) + }, + // 鏂板鏂瑰紡淇敼 + async getSelectArray(val, index) { + if(!this.workType){ + if(Array.isArray(val)&&val.length>0){ + val.forEach(item=>{ + if(item.location){ + item.fromLocationId=item.location.name; + } + item.toLocationId=this.editConfig.infomation.toLocation; + item.relAmount=1; + item.silkMarket=this.editConfig.infomation.silkMarket||""; + if(!item.silkMarketClose){ + item.silkMarketClose='鍚�'; + } + }); + } + //const warehouse=this.warehouseList.find(item=>item.id==this.editConfig.infomation.warehouseId)||{}; + /* const {code,data}=await getLocationList({ + warehouseId: this.editConfig.infomation.warehouseId, + type:3, + page: 1, + pageSize: 100 + }); + if(code===200){ + if(Array.isArray(val)&&val.length>0){ + val.forEach(item=>{ + if(Array.isArray(data)&&data.length>0){ + item.fromLocationId=data[0].name; + }else{ + item.fromLocationId=''; + } + if (!item.amount){ + item.amount=1; + } + item.relAmount=1; + }) + } + }*/ + }else{ + if(Array.isArray(val)&&val.length>0){ + val.forEach(item=>{ + if(this.workType==1){ + item.fromLocationId=this.editConfig.infomation.location||''; + item.toLocationId=this.editConfig.infomation.location||''; + }else{ + if(item.location){ + item.fromLocationId=item.location.name; + } + item.toLocationId=this.editConfig.infomation.toLocation; + } + item.relAmount=1; + item.silkMarket=this.editConfig.infomation.silkMarket||""; + if(!item.silkMarketClose){ + item.silkMarketClose='鍚�' + } + }); + } + } + if (this.tableData.length == 1 && this.tableData[0].number&&this.tableData[0].number.length == 0) { + this.tableData = []; + } + if (index < this.tableData.length) { + this.tableData.splice(index, 1); + val.map((item, ind) => { + this.tableData.splice(index + ind, 0, JSON.parse(item)); + }); + } else { + val.forEach(item=>{ + let flag=-1; + this.tableData.forEach((tableItem,index)=>{ + if(this.workType!=1){ + if(item.id==tableItem.id&&item.location.warehouseId==tableItem.location.warehouseId&&item.location.name==tableItem.location.name){ + flag=index; + } + } else{ + if(item.id===tableItem.id){ + flag=index; + } + } + }); + if(flag===-1){ + this.tableData.push(item); + }else{ + this.tableData[flag].amount=parseInt(this.tableData[flag].amount)+parseInt(item.amount); + } + }); + } + const list= this.getTwoTable(this.tableData,2); + //1.澶勭悊娴姩鐨勭粨鏋� + list.forEach(item=>{ + if(Array.isArray(item.moreUnitList)&&item.moreUnitList.length>0){ + item.moreUnitList.forEach(moreUnitItem=>{ + if(moreUnitItem.floating){ + moreUnitItem.floatingValue=parseFloat(1.00/moreUnitItem.amount); + } + }) + } + }); + this.tableData = list; + this.productTableList.tableData = JSON.parse(JSON.stringify(list)); + }, + // 浜у搧娓呯┖ + emptyProductClick() { + this.tableData = []; + this.productTableList.tableData = this.tableData; + }, + clearupProduct(data) { + this.tableData = data; + this.productTableList.tableData = this.tableData; + }, // 鍒犻櫎 handleDelClick(scope, value) { - console.log(scope) - if (value === "鎿嶄綔") { - this.tableData.splice(scope.$index, 1) + if (value == "鎿嶄綔") { + this.tableData.splice(scope.$index, 1); + this.productTableList.tableData = this.tableData; + this.$message.success("鍒犻櫎鎴愬姛锛�"); } else { - this.detailTableData.splice(scope.$index, 1) + this.detailTableData.splice(scope.$index, 1); } }, // 璇︽儏鍒楄〃 setDetailTableForm() { - this.setTableColumn() + this.setTableColumn(); this.detailTableList = { tableData: this.detailTableData, - tableColumn: this.tableColumn - } + tableColumn: this.tableColumn, + }; }, setTableColumn() { - if (this.workType === "鍐呴儴璋冩嫧") { + if (this.workType == "鍐呴儴璋冩嫧"||this.workType==3) { this.tableColumn = [ { label: "浜у搧", prop: "name", productName: true, isRequird: true }, - { label: "浠�", prop: "number", select: true }, + { label: "浠�", prop: "number", select: true,min:120,}, { label: "鑷�", prop: "amount", select: true }, { label: "瀹屾垚", prop: "total", inputFloat: true }, - { label: "璁¢噺鍗曚綅", prop: "total", select: true } - ] + { label: "璁¢噺鍗曚綅", prop: "total", select: true }, + ]; } else { this.tableColumn = [ { label: "浜у搧", prop: "name", productName: true, isRequird: true }, - { label: "浠�", prop: "number", select: true }, + { label: "浠�", prop: "number", select: true , min:120,}, { label: "瀹屾垚", prop: "total", inputFloat: true }, - { label: "璁¢噺鍗曚綅", prop: "total", select: true } - ] + { label: "璁¢噺鍗曚綅", prop: "total", select: true }, + ]; } }, // 璇︽儏杈撳叆 inputDetail(val, prop, row) { - this.detailId = row.detailId + this.detailId = row.detailId; this.detailTableData.map((item) => { - if (item.detailId === row.detailId) { - item[prop] = val + if (item.detailId == row.detailId) { + item[prop] = val; } + }); + }, + // 瀹㈡埛閫夋嫨 + companyChange(val) { + console.log(val); + this.companyObj = val; + }, + // 璐熻矗浜洪�夋嫨 + contacterChange(val) { + this.contacterObj = val; + }, + // 楠岃瘉 + async validateClick() { + await updateStatus(this.editConfig.infomation.id).then((res) => { + console.log(res); + this.editConfig.visible = false; + if (res.code == 200) { + this.$message.success("楠岃瘉鎴愬姛"); + this.$parent.getData(); + } + }); + }, + + // 鍙栨秷 + btnCancel() { + this.$confirm("纭畾鍙栨秷鍚楋紵", "鎻愮ず", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning", }) - } - } -} + .then(() => { + stateCancel(this.editConfig.infomation.id).then((res) => { + console.log(res); + this.editConfig.visible = false; + if (res.code == 200) { + this.$message.success("鍙栨秷璋冩嫧"); + this.$parent.getData(); + } + }); + this.list.map((item) => { + if (item.label == "宸插彇娑�") { + item.status = "active"; + } else { + item.status = "todo"; + } + }); + }) + .catch(() => {}); + }, + //鎵撳嵃 + async btnPrint() { + if (this.workType !== 3) { + localStorage.removeItem("pdfParams"); + try { + let res = await printReceipts(this.editCommonConfig.infomation.id); + if (res.code == 200) { + console.log(this.editConfig.infomation.baseOperationType, "绫诲瀷"); + let name='' + if(res.data){ + name=res.data.name?res.data.name:'' + } + let pdfParams = { + url: res.data?res.data.url:'', + baseOperationType: + this.editConfig.infomation.baseOperationType || undefined, + // 1鏄槈鑱� + cutAfterWidth:name=='jialian'?53.9: + (this.editConfig.infomation.baseOperationType == 2 + ? 50.8 + : 53.3), + }; + var { href } = this.$router.resolve({ + path: "/overview/previewExcel", + query: { + ...pdfParams, + }, + }); + window.open(href, "_blank"); + } + } catch (error) { + console.error(error); + } + } + }, + // 璋冨嚭浣嶇疆閫夋嫨 + rootLocationChange(val) { + if(this.workType==1){ + this.productTableList.tableData.forEach(item=>{ + item.fromLocationId=val; + item.toLocationId=val; + }); + } + /*this.locationId=val; + this.tableData.forEach(item=>{ + item.fromLocationId=val; + item.toLocationId=val; + });*/ + //this.editConfig.infomation.location = val; + // this.productTableList.tableData.map((item)=>{ + // console.log(item,"item") + // // item.toLocationId={} + // // item.fromLocationId={} + // }) + }, + // 浠撳簱浣嶇疆閫夋嫨 + toLocationChange(val) { + const locationObj=this.toLocationOptions.find(item=>item.id===val); + this.warehouseId=locationObj.warehouseId; + if(this.workType==3){ + getLocationList({ + warehouseId:this.warehouseId, + type:3, + keyWord: "", + page: 0, + pageSize: 0, + }).then((res) => { + if (res.code == 200) { + //this.toLocationOptions = res.data; + this.$refs.tableView.setLocationList(res.data, "toLocation"); + } + }); + } + this.tableData.forEach(item=>{ + item.toLocationId=val; + }); + //this.editConfig.infomation.toLocation = val; + }, + }, +}; </script> <!-- Add "scoped" attribute to limit CSS to this component only --> <style lang="scss" scoped> + .more-unit{ + display: flex; + flex: 1; + } .dialog-header { display: flex; align-items: center; font-size: 14px; color: #333; + .header_btns { margin-left: auto; margin-right: 60px; + .btn { + cursor: pointer; + } + + .btn:nth-of-type(2) { cursor: no-drop; + color: #ccc; } } } + .content-status { display: flex; } + .basic-info { height: calc(100% - 80px); overflow: auto; margin: 20px; - border: 1px solid #dcdfe6; - box-shadow: inset 0 0 2px #dee2e6; - -moz-box-shadow: inset 0 0 2px #dee2e6; - -webkit-box-shadow: inset 0 0 2px #dee2e6; - .basic-info-view { - margin-top: 20px; - } + // border: 1px solid #dcdfe6; + // box-shadow: inset 0 0 2px #dee2e6; + // -moz-box-shadow: inset 0 0 2px #dee2e6; + // -webkit-box-shadow: inset 0 0 2px #dee2e6; + // .basic-info-view { + // margin-top: 20px; + // } } + .purchase-view { display: flex; + .left { width: 50%; } + .right { width: 50%; } } + .second-label { margin-left: 20px; border-bottom: 1px solid #d9d9d9; margin-bottom: 10px; } + ::v-deep { .el-dialog__headerbtn { position: absolute; - top: 18px; + top: 15px; } + .el-button { &:hover { border: 1px solid #dcdfe6; color: #333; } } - .el-tabs--card > .el-tabs__header .el-tabs__nav { - margin-left: 20px; + + .el-tabs--card > .el-tabs__header { + border-bottom: none; } + + // .el-tabs__item.is-active { + // color: #333; + // background: #f1f3f8; + // } .el-tabs__item { height: 30px; line-height: 30px; font-size: 13px; + background: #f3f3f3; + } + + .el-tabs__header { + margin: 0 0 1px; + } + + .bottom { + .el-form { + // border-top: 1px solid #EBEEF5; + } + + .el-form-item { + height: 28px; + + .el-input { + input { + height: 28px; + } + } + } } } </style> -- Gitblit v1.8.0