src/views/aps/joinresgroup/resource.vue
@@ -9,7 +9,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" :paramArr="resourceIdArr" ref="joinResGroupResourceTable" src/views/aps/resource/workstation.vue
@@ -9,7 +9,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" ref="resourceWorkstationTable" > src/views/aps/tree/resource.vue
@@ -6,7 +6,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="400" :bottomOffset="150" :ajaxFun="ajaxFun" ref="treeResourceTable" > src/views/basic/crew/index.vue
@@ -30,7 +30,7 @@ > <template #toolbar> <el-button type="primary" @click="addHandle" v-if="permissions.basic_crew_person_add"></el-button> v-if="permissions.basic_crew_person_add">添加</el-button> </template> </ttable> </el-col> src/views/basic/shift/shift-form.vue
@@ -42,7 +42,7 @@ > </el-time-picker> </el-col> <el-col :span="5" :offset="1"> <el-col :span="9" :offset="3"> <el-form-item prop="mondayWorkHours" style="margin-bottom:0px"> <el-input v-model="dataForm.mondayWorkHours" @@ -73,7 +73,7 @@ > </el-time-picker> </el-col> <el-col :span="5" :offset="1"> <el-col :span="9" :offset="3"> <el-form-item prop="tuesdayWorkHours" style="margin-bottom:0px"> <el-input v-model="dataForm.tuesdayWorkHours" @@ -104,7 +104,7 @@ > </el-time-picker> </el-col> <el-col :span="5" :offset="1"> <el-col :span="9" :offset="3"> <el-form-item prop="wensdayWorkHours" style="margin-bottom:0px"> <el-input v-model="dataForm.wensdayWorkHours" @@ -135,7 +135,7 @@ > </el-time-picker> </el-col> <el-col :span="5" :offset="1"> <el-col :span="9" :offset="3"> <el-form-item prop="thursdayWorkHours" style="margin-bottom:0px"> <el-input v-model="dataForm.thursdayWorkHours" @@ -166,7 +166,7 @@ > </el-time-picker> </el-col> <el-col :span="5" :offset="1"> <el-col :span="9" :offset="3"> <el-form-item prop="fridayWorkHours" style="margin-bottom:0px"> <el-input v-model="dataForm.fridayWorkHours" @@ -197,7 +197,7 @@ > </el-time-picker> </el-col> <el-col :span="5" :offset="1"> <el-col :span="9" :offset="3"> <el-form-item prop="saturdayWorkHours" style="margin-bottom:0px"> <el-input v-model="dataForm.saturdayWorkHours" @@ -228,7 +228,7 @@ > </el-time-picker> </el-col> <el-col :span="5" :offset="1"> <el-col :span="9" :offset="3"> <el-form-item prop="sundayWorkHours" style="margin-bottom:0px"> <el-input v-model="dataForm.sundayWorkHours" src/views/common/completeproductstructure.vue
@@ -17,7 +17,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="queryParam" ref="commonCompleteproductstructureTable" src/views/common/customerorder.vue
@@ -15,7 +15,7 @@ :prelang="prelang" :options="options" :ajaxFun="ajaxFun" :bottomOffset="350" :bottomOffset="150" :paramArr="type" ref="customerOrderTable" > src/views/common/document.vue
@@ -50,7 +50,7 @@ :prelang="prelang" :options="options" :ajaxFun="ajaxFun" :bottomOffset="350" :bottomOffset="150" :fixedHeight="tableFixHeight" ref="documentTable" :paramObj="queryParam" src/views/common/joinstockorder.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="joinStockOrderTable" src/views/common/location.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" ref="commonLocationTable" > src/views/common/manufacturingorder.vue
@@ -9,7 +9,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" ref="commonManufacturingOrderTable" > src/views/common/operation.vue
@@ -17,7 +17,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" ref="commonOperationTable" > src/views/common/operationParamTemplate.vue
@@ -21,7 +21,7 @@ :paramObj="paramTemplateObj" :selColValArr="paramTemplateSelArr" :selCol="paramTemplateSelCol" :bottomOffset="350" :bottomOffset="150" ref="operationParamTemplateTable" > <template #toolbar></template> src/views/common/order-stock.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" :selColValArr="paramSelArr" src/views/common/param.vue
@@ -19,7 +19,7 @@ :ajaxFun="ajaxFun" :selColValArr="paramSelArr" :selCol="paramSelCol" :bottomOffset="350" :bottomOffset="150" ref="paramTable" > <template #toolbar></template> src/views/common/part.vue
@@ -1,7 +1,7 @@ <template> <el-dialog v-diadrag width="60%" width="70%" title="零件" top="5vh" :visible.sync="innerVisible" @@ -18,7 +18,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="commonPartTable" src/views/common/partfamily.vue
@@ -9,7 +9,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" ref="commonPartFamilyTable" > src/views/common/productout.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="commonProductoutTable" src/views/common/productstructure.vue
@@ -17,7 +17,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="queryParam" ref="commonProductstructureTable" src/views/common/rawMaterial-part.vue
@@ -19,7 +19,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" :isShowPagination="false" @@ -248,10 +248,10 @@ margin-top: 0px; margin-bottom: 5px; } @media screen and (max-width: 800px) { /* @media screen and (max-width: 800px) { .el-dialog { height: 600px !important; } } } */ </style>
@@ -9,7 +9,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" ref="commonResourceTable" > src/views/common/routing.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="queryParam" ref="commonRoutingTable" src/views/common/routingOperationTemplate.vue
@@ -20,7 +20,7 @@ :paramObj="paramTemplateObj" :selColValArr="paramTemplateSelArr" :selCol="paramTemplateSelCol" :bottomOffset="350" :bottomOffset="150" ref="operationParamTemplateTable" > <template #toolbar></template> src/views/common/staff.vue
@@ -18,7 +18,7 @@ :options="options" :selColValArr="paramSelArr" :selCol="paramSelCol" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" ref="commonStaffTable" > src/views/common/step.vue
@@ -17,7 +17,7 @@ :prelang="prelang" :options="options" :ajaxFun="ajaxFun" :bottomOffset="350" :bottomOffset="150" ref="commonStepTable" > <template #toolbar></template> src/views/common/stock-multi.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" :selColValArr="paramSelArr" src/views/common/stock.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" :selColValArr="paramSelArr" src/views/common/user.vue
@@ -18,7 +18,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="commonUserTable" src/views/common/workstaff.vue
@@ -11,7 +11,7 @@ :options="options" :selColValArr="selColValArr" :selCol="selCol" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" ref="commonStaffTable" > src/views/common/workstation.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" ref="commonWorkstationTable" > src/views/common/workstationMulti.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" ref="commonWorkstationMultiTable" > src/views/common/ztt-table.vue
@@ -164,7 +164,7 @@ :span-method="objectSpanMethod" :header-cell-style="tableHeaderStyle" v-adaptive="{ bottomOffset: bottomOffset, fixedHeight: fixedHeight }" height="100px" height="300px" :class="[ 'commonTable', isGeneralSearch && !isEdit @@ -568,6 +568,10 @@ return 'id' } }, toolbarMaxLength: { type: Number, default: 5, }, // 表格型号：mini,medium,small tableSize: { type: String, default: 'small' }, // 数据请求方法 @@ -755,11 +759,11 @@ return colList }, getToolBarBtn() { return this.table.toolbar ? this.table.toolbar.slice(0, 5) : [] return this.table.toolbar ? this.table.toolbar.slice(0, this.toolbarMaxLength) : [] }, getToolbarDown() { return this.getToolBarBtn.length === 5 ? this.table.toolbar.slice(5, this.table.toolbar.length) return this.getToolBarBtn.length == this.toolbarMaxLength ? this.table.toolbar.slice(this.toolbarMaxLength, this.table.toolbar.length) : [] }, isRefreshBtn() { src/views/plan/customerorder/customerorder-config-history.vue
@@ -27,7 +27,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="commonPartTable" src/views/plan/customerorder/synchronize-part.vue
@@ -18,7 +18,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" :paramArr="type" src/views/plan/manufacturingorder/DelMatUnIssue.vue
@@ -16,7 +16,7 @@ " :options="options" :ajaxFun="ajaxFun" :bottomOffset="250" :bottomOffset="150" ref="delMatUnIssueTable" > <template #toolbar></template> src/views/plan/manufacturingorder/orderSpotCheckRule.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="orderSpotCheckRuleTable" src/views/plan/manufacturingorder/routing.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" ref="routingTable" :paramObj="queryParam" src/views/plan/operationtaskreserved/stock.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" :paramArr="paramArr" src/views/plan/schedule/manufacturingorder.vue
@@ -13,7 +13,7 @@ :options="options" :ajaxFun="ajaxFun" ref="manufacturingOrderTable" :bottomOffset="255" :bottomOffset="150" > <template #toolbar></template> </ttable> src/views/product/artificialinformationjoin/handymantype.vue
@@ -7,7 +7,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramArr="handyTypeId" ref="commonHandymanTypeTable" src/views/product/artificialinformationjoin/handymantype_form.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :paramArr="handyId" :ajaxFun="ajaxFun" ref="commonHandymanTypeTable" src/views/product/dutyrecord/dutyrecord-table.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" ref="dutyRecordTable" > src/views/product/dutyrecord/handymantype.vue
@@ -66,7 +66,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="commonHandymanTypeTable" src/views/product/workbench/handymantype.vue
@@ -45,7 +45,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="commonHandymanTypeTable" src/views/product/workbench/product-record-form-list.vue
@@ -15,7 +15,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="commonProductoutputTable" src/views/product/workbench/productoutput-dialog.vue
@@ -15,7 +15,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="commonProductoutputTable" src/views/product/workbench/productoutput-list.vue
@@ -4,7 +4,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" @ttRowClick="saveSelectRow" src/views/product/workbench/split-stock.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="stockPartTable" src/views/quality/Packaging_ledger/pack-from.vue
@@ -15,7 +15,7 @@ :prelang="prelang" :options="options" :ajaxFun="ajaxFun" :bottomOffset="350" :bottomOffset="150" ref="paramTable" > <template #toolbar></template> src/views/quality/Packaging_ledger/pack-fromadd.vue
@@ -16,7 +16,7 @@ :options="options" :ajaxFun="ajaxFun" :paramObj="packageBoxIddata" :bottomOffset="350" :bottomOffset="150" ref="paramTable" > <template #toolbar></template> src/views/quality/finishedProductInspection/finishedProduct-form.vue
@@ -118,12 +118,12 @@ :cell-style="{textAlign:'center'}" row-key="iid" default-expand-all style="width: 100%" ref="table" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> <el-table-column type="index" label="序号" width="60"></el-table-column> <el-table-column label="项目" prop="father" width="240" ></el-table-column> <el-table-column prop="iname" label="指标" width="240" ></el-table-column> <el-table-column prop="iunit" label="单位" width="240" ></el-table-column> <el-table-column prop="required" label="标准值" width="240" ></el-table-column> <el-table-column label="项目" prop="father" show-overflow-tooltip width="140" ></el-table-column> <el-table-column prop="iname" label="指标" show-overflow-tooltip width="140" ></el-table-column> <el-table-column prop="iunit" label="单位" show-overflow-tooltip width="140" ></el-table-column> <el-table-column prop="required" label="标准值" width="140" show-overflow-tooltip ></el-table-column> <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值" width="240" style="text-align: center;"> width="140" style="text-align: center;"> <template slot-scope="scope"> <el-col v-if="scope.row.itype === '1'"> <el-tooltip v-if="scope.row.iname!=null" :disabled="scope.row.eId != null" @@ -148,11 +148,11 @@ </el-col> </template> </el-table-column> <el-table-column prop="deviceName" label="试验设备" min-width="250"> <el-table-column prop="deviceName" label="试验设备" min-width="200"> <template slot-scope="scope"> <span v-if="resultVal!=null && processInspectVo.id!=null" v-text="scope.row.ename"></span> <div v-else> <el-select style="width:80%" v-model="scope.row.eId" <el-select style="width:60%" v-model="scope.row.eId" v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row)"> <el-option v-for="(item,index) in deviceList" :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option> @@ -167,7 +167,7 @@ </template> </el-table-column> <el-table-column prop="inspectionValue" label="检验描述" width="240" style="text-align: center;"> label="检验描述" width="140" style="text-align: center;"> <template slot-scope="scope"> <el-col v-if="scope.row.itype === '1'"> <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null" @@ -214,9 +214,9 @@ <el-col :span="24"> <el-table border height="90" :data="inspectionResultForm" :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}" :cell-style="{textAlign:'center'}"> <el-table-column prop="materialCode" label="物料编号"></el-table-column> <el-table-column prop="material" label="物料名称"></el-table-column> :cell-style="{textAlign: 'center'}"> <el-table-column prop="materialCode" width="200" label="物料编号" show-overflow-tooltip></el-table-column> <el-table-column prop="material" width="200" label="物料名称" show-overflow-tooltip></el-table-column> <el-table-column prop="userName" label="检验员"></el-table-column> <el-table-column prop="result" label="检验结论"> <template slot-scope="scope"> src/views/quality/newReport/TestMan.vue
@@ -18,7 +18,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" ref="testManTable" > src/views/quality/packageinspect/packageInspect-form.vue
@@ -64,11 +64,11 @@ </div> <div class="packageInspect-detail"> <el-row :gutter="10" style="width:100%;z-index: 10;height:50px;"> <el-col :span="20">检验项目</el-col> <el-col :span="2"> <el-button v-if="resultVal=='' || resultVal==null" style="width:100%" size="small" @click="clickAddLine()">添加检验项目</el-button> <el-col :sm="18" :lg="20">检验项目</el-col> <el-col :sm="3" :lg="2" > <el-button v-if="resultVal=='' || resultVal==null" size="small" @click="clickAddLine()">添加检验项目</el-button> </el-col> <el-col :span="2"> <el-col :sm="3" :lg="2"> <el-button v-if="resultVal=='' || resultVal==null" style="width:100%" type="primary" size="small" @click="savePackIns()">保存</el-button> </el-col> @@ -88,13 +88,13 @@ :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> <el-table-column type="index" label="序号" width="60"> </el-table-column> <el-table-column prop="name" label="项目" width="260"> <el-table-column prop="name" label="项目" width="160"> <template slot-scope="scope"> <el-input :readonly="resultVal!=null" v-if="scope.row.children" class="inline-input" style="width:90%;" v-model="scope.row.name" <el-input :readonly="resultVal!=null" v-if="scope.row.children" class="inline-input" style="width:80%;" v-model="scope.row.name" placeholder="请输入项目名称"></el-input> </template> </el-table-column> <el-table-column prop="required" label="要求" width="260"> <el-table-column prop="required" label="要求" width="160" show-overflow-tooltip> <template slot-scope="scope"> <div v-if="!scope.row.children"> <el-input :readonly="resultVal!=null" v-model="scope.row.required" @@ -102,7 +102,7 @@ </div> </template> </el-table-column> <el-table-column prop="note" label="检验描述" width="260" > <el-table-column prop="note" label="检验描述" width="160" show-overflow-tooltip> <template slot-scope="scope"> <div v-if="!scope.row.children"> <el-input :readonly="resultVal!=null" v-model="scope.row.note" placeholder="检验描述"></el-input> @@ -140,8 +140,8 @@ <el-table class="l-mes" border height="90" :data="conclusionTable" ref="conclusion" v-model="conclusion" :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}" :cell-style="{textAlign:'center'}"> <el-table-column prop="packageNo" label="包装编号"></el-table-column> <el-table-column prop="userName" label="检验员"></el-table-column> <el-table-column prop="packageNo" label="包装编号" width="200" show-overflow-tooltip></el-table-column> <el-table-column prop="userName" label="检验员" width="200" show-overflow-tooltip></el-table-column> <el-table-column prop="result" label="检验结论"> <template slot-scope="scope"> <el-select :disabled="resultVal!=null" style="width:100%" v-model="scope.row.result"> src/views/quality/parts/template.vue
@@ -9,7 +9,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" ref="templateTable" > src/views/quality/processInspect/processInspect-form.vue
@@ -104,13 +104,13 @@ default-expand-all style="width: 100%" ref="table" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"> <el-table-column type="index" label="序号" width="60"></el-table-column> <el-table-column label="项目" prop="father" width="240"></el-table-column> <el-table-column prop="iname" label="指标" width="240"></el-table-column> <el-table-column prop="iunit" label="单位" width="240"></el-table-column> <el-table-column prop="required" label="标准值" width="240"></el-table-column> <el-table-column type="index" label="序号" show-overflow-tooltip width="60"></el-table-column> <el-table-column label="项目" prop="father" show-overflow-tooltip width="140"></el-table-column> <el-table-column prop="iname" label="指标" show-overflow-tooltip width="140"></el-table-column> <el-table-column prop="iunit" label="单位" show-overflow-tooltip width="140"></el-table-column> <el-table-column prop="required" label="标准值" width="140"></el-table-column> <el-table-column prop="inspectionValue" v-for="(item, index) in empiricalValueAdd" :key="index" label="检测值" width="240" style="text-align: center;"> label="检测值" width="140" style="text-align: center;"> <template slot-scope="scope"> <el-col v-if="scope.row.itype === '1'"> <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null" @@ -136,12 +136,12 @@ </el-col> </template> </el-table-column> <el-table-column prop="deviceName" label="试验设备" min-width="250"> <el-table-column prop="deviceName" label="试验设备" min-width="200"> <template slot-scope="scope"> <span v-if="resultVal != null && scope.row.iname != null" v-text="scope.row.ename"></span> <div v-else> <el-select style="width:80%" v-model="scope.row.eId" v-if="scope.row.iname != null" <el-select style="width:60%" v-model="scope.row.eId" v-if="scope.row.iname != null" filterable @change="updateDevice(scope.row, scope.$index)"> <el-option v-for="(item, index) in deviceList" :key="index" :value="item.id" :label="item.code + '-' + item.name"></el-option> @@ -155,8 +155,8 @@ </div> </template> </el-table-column> <el-table-column label="检验描述" width="240" style="text-align: center;"> <el-table-column show-overflow-tooltip label="检验描述" width="140" style="text-align: center;"> <template slot-scope="scope"> <el-col> <el-tooltip v-if="scope.row.iname != null" :disabled="scope.row.eId != null" @@ -192,8 +192,8 @@ <el-table border height="90" :data="inspectionResultForm" :header-cell-style="{ textAlign: 'center', color: 'black', backgroundColor: '#fafafa' }" :cell-style="{ textAlign: 'center' }"> <el-table-column prop="materialCode" label="物料编号"></el-table-column> <el-table-column prop="material" label="物料名称"></el-table-column> <el-table-column prop="materialCode" width="200" show-overflow-tooltip label="物料编号"></el-table-column> <el-table-column prop="material" width="200" show-overflow-tooltip label="物料名称"></el-table-column> <el-table-column prop="userName" label="检验员"></el-table-column> <el-table-column prop="result" label="检验结论"> <template slot-scope="scope"> src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -115,14 +115,14 @@ <el-tabs class="rawMaterial-detail" @tab-click="tabsClick"> <el-tab-pane label="检验项目"> <el-row style="width:100%;z-index: 10;height:50px;"> <el-col :sm="12" :lg="18"></el-col> <el-col :sm="4" :lg="2" style="text-align: right;"> <el-col :sm="15" :lg="18"></el-col> <el-col :sm="3" :lg="2" style="text-align: right;"> <el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">添加检验项目</el-button> </el-col> <el-col :sm="4" :lg="2" style="text-align: right;"> <el-col :sm="3" :lg="2" style="text-align: right;"> <el-button class="pad-addcol-btn" v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">添加检测值列</el-button> </el-col> <el-col :sm="4" :lg="2" style="text-align: right;"> <el-col :sm="3" :lg="2" style="text-align: right;"> <el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">删除检测值列</el-button> </el-col> </el-row> @@ -141,12 +141,12 @@ :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> <el-table-column type="index" label="序号" width="60"> </el-table-column> <el-table-column prop="father" label="检验项目" width="260"> <el-table-column prop="father" label="检验项目" width="160"> <template slot-scope="scope"> <el-input v-if="scope.row.children" style="width:90%" :disabled="dataForm.id!=null" v-model="scope.row.father" placeholder="请输入检验项目"></el-input> </template> </el-table-column> <el-table-column prop="name" label="项目" width="260"> <el-table-column prop="name" label="项目" width="160"> <template slot-scope="scope"> <div v-if="!scope.row.children"> <el-input class="inline-input" :disabled="dataForm.id!=null" v-model="scope.row.name" @@ -154,7 +154,7 @@ </div> </template> </el-table-column> <el-table-column prop="unit" label="单位" width="260"> <el-table-column prop="unit" label="单位" width="160"> <template slot-scope="scope"> <div v-if="!scope.row.children"> <el-input :disabled="dataForm.id != null" v-model="scope.row.unit" placeholder="请输入单位"></el-input> @@ -162,7 +162,7 @@ </template> </el-table-column> <el-table-column prop="required" label="标准值" width="260"> <el-table-column prop="required" label="标准值" width="160"> <template slot-scope="scope"> <div v-if="!scope.row.children"> <el-input :disabled="dataForm.id != null" v-model="scope.row.required" @@ -170,7 +170,7 @@ </div> </template> </el-table-column> <el-table-column prop="testValue" label="检测值" min-width="260" v-for="(item,index) in empiricalValueAdd" :key="index"> <el-table-column prop="testValue" label="检测值" min-width="160" v-for="(item,index) in empiricalValueAdd" :key="index"> <template slot-scope="scope"> <div v-if="!scope.row.children"> <el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="请先选择设备！" placement="top-start"> @@ -186,10 +186,10 @@ </div> </template> </el-table-column> <el-table-column prop="deviceName" label="试验设备" min-width="260"> <el-table-column prop="deviceName" label="试验设备" min-width="200"> <template slot-scope="scope"> <div v-if="!scope.row.children"> <el-select ref="" :disabled="dataForm!=null && resultVal!=null" style="width:80%" <el-select ref="" :disabled="dataForm!=null && resultVal!=null" style="width:60%" v-model="scope.row.deviceId" filterable @change="updateDevice(scope.row,scope.$index)"> <el-option v-for="(item,index) in deviceList" :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option> @@ -203,7 +203,7 @@ </div> </template> </el-table-column> <el-table-column prop="note" label="检验描述" width="260" > <el-table-column prop="note" label="检验描述" width="160" > <template slot-scope="scope"> <div v-if="!scope.row.children"> <el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null || (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="检验描述"></el-input> @@ -264,6 +264,7 @@ <el-table-column prop="rawInsNo" align="center" width="120" label="原材料检验编号" show-overflow-tooltip ></el-table-column> @@ -319,8 +320,8 @@ <el-table border height="90" :data="conclusionTable" ref="conclusion" v-model="conclusion" :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}" :cell-style="{textAlign:'center'}"> <el-table-column prop="code" label="物料编号"></el-table-column> <el-table-column prop="name" label="物料名称"></el-table-column> <el-table-column prop="code" width="150" show-overflow-tooltip label="物料编号"></el-table-column> <el-table-column prop="name" width="150" show-overflow-tooltip label="物料名称"></el-table-column> <el-table-column prop="userName" label="检验员"></el-table-column> <el-table-column prop="judgeState" label="检验结论"> <template slot-scope="scope"> src/views/quality/task/templatePart.vue
@@ -10,7 +10,7 @@ :isShowHide="true" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" ref="templatePartTable" > src/views/quality/teststandard/index.vue
@@ -8,6 +8,7 @@ @handleSelectionChange="handleCurrentChange" :uploadInfo="uploadInfo" :prelang="prelang" :toolbarMaxLength="3" :options="options" :ajaxFun="ajaxFun" @dbClickRow="handleDbClickRow" src/views/technology/document/spotCheckRule.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="spotCheckRuleTable" src/views/technology/routing/routing-part.vue
@@ -18,7 +18,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" ref="commonPartTable" src/views/warehouse/check/part-choose.vue
@@ -16,7 +16,7 @@ :isShowHide="true" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" ref="partTable" > src/views/warehouse/preparedetail/stock.vue
@@ -16,7 +16,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" ref="stockTable" :paramArr="paramArr" src/views/warehouse/receiving/delivery-detail-index.vue
@@ -7,7 +7,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" ref="deliveryDetailTable" :paramObj="paramObj" src/views/warehouse/receiving/receiving-detail-index.vue
@@ -6,7 +6,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :ajaxFun="ajaxFun" ref="receivingDetailTable" :paramObj="paramObj" src/views/warehouse/return/return-detail-index.vue
@@ -8,7 +8,7 @@ :isShowHide="true" :prelang="prelang" :options="options" :bottomOffset="255" :bottomOffset="150" :paramObj="paramObj" :ajaxFun="ajaxFun" ref="returnDetailTable" src/views/warehouse/returnstock/stock-part.vue
@@ -18,7 +18,7 @@ :uploadInfo="uploadInfo" :prelang="prelang" :options="options" :bottomOffset="350" :bottomOffset="150" :ajaxFun="ajaxFun" :paramObj="paramObj" :selColValArr="paramTemplateSelArr"
