From a6c14c75e5a5f677c2a3571cad426d50cb106e3d Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期五, 09 八月 2024 09:02:59 +0800 Subject: [PATCH] 修改检验任务、下单bug --- src/components/tool/value-table.vue | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue index d9df2a2..200cd41 100644 --- a/src/components/tool/value-table.vue +++ b/src/components/tool/value-table.vue @@ -124,17 +124,17 @@ <el-table-column type="index" align="center" label="搴忓彿" :width="selectionWidth" v-if="data.isIndex" :key="Math.random()"> </el-table-column> <el-table-column :prop="a.label" :label="a.value" :sortable="a.sort === 'custom' ? 'custom' : false" :isColumnWidth="isColumnWidth" :isShowZero="isShowZero" - v-for="(a, ai) in tableHead" :key="ai" show-overflow-tooltip :min-width="columnMinWidth" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))"> + v-for="(a, ai) in tableHead" :key="ai+'bbbbb'" show-overflow-tooltip :min-width="columnMinWidth" v-if="!data.headNoShow||(data.headNoShow&&data.headNoShow.length==0)||(data.headNoShow&&data.headNoShow.length>0&&!data.headNoShow.find(d=>d==a.label))"> <template slot-scope="scope"> <div v-if="showType(a.label, data.tagField) != null"> <template v-if="typeof(scope.row[a.label]) == 'object'"> <template v-for="(param, i) in scope.row[a.label]"> - <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == param" + <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi+'cccc'" v-if="b.value == param" :type="b.type" size="medium" style="margin-right: 5px;">{{b.label}}</el-tag> </template> </template> <template v-else> - <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi" v-if="b.value == scope.row[a.label]" + <el-tag v-for="(b, bi) in data.tagField[a.label].select" :key="bi+'ddddd'" v-show="b.value == scope.row[a.label]" :type="b.type" size="medium">{{b.label}}</el-tag> </template> </div> @@ -148,7 +148,8 @@ </el-table-column> <el-table-column fixed="right" align="center" label="鎿嶄綔" :width="getWidth()" v-if="data.do.length > 0"> <template slot-scope="scope"> - <el-button v-for="(a, ai) in data.do" :key="ai" :type="a.type" + <el-button v-for="(a, ai) in data.do" :key="ai + +'qqqq'" :type="a.type" :disabled="a.disabFun ? a.disabFun(scope.row,scope.$index) : false" @click="main(scope.row, a)" class="handleBtn"> <span v-if="a.type!='upload'">{{a.font}}</span> @@ -172,7 +173,7 @@ <el-dialog title="缂栬緫" :visible.sync="upDia" :width="data.row==1?'500px':540+data.row * 200 + 'px'" append-to-body> <div class="body" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;"> <div v-if="data.row > 1"> - <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;"> + <div v-for="(a, ai) in upHead" :key="ai+'ffff'" style="line-height: 50px;"> <el-col :span="6/data.row" style="text-align: right;" :offset="1"> <span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}锛� </el-col> @@ -183,7 +184,7 @@ <el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small" v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)" clearable filterable> - <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value" + <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'eeeee'" :value="b.value" :label="b.label"> </el-option> </el-select> @@ -204,7 +205,7 @@ </div> </div> <div v-else> - <el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;"> + <el-row v-for="(a, ai) in upHead" :key="ai+'ggggg'" style="line-height: 50px;"> <el-col :span="6" style="text-align: right;"> <span class="required-span" v-if="showUpReq(a.label)">* </span>{{a.value}}锛� </el-col> @@ -215,7 +216,7 @@ <el-select v-model="upData[a.label]" :multiple="data.selectField[a.label].choose" size="small" v-if="showType(a.label, data.selectField) != null" style="width: 100%;" :disabled="isDisabled(a.label)" clearable filterable> - <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value" + <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'fffff'" :value="b.value" :label="b.label"></el-option> </el-select> <el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)" :multiple="false" @@ -241,7 +242,7 @@ <el-dialog title="鏂板" :visible.sync="addDia" :width="data.row==1?'500px':540+data.row * 200 + 'px'" append-to-body> <div class="body" v-if="addDia" style="max-height: 550px;overflow-y: auto;padding: 5px 10px 5px 0;"> <div v-if="data.row > 1"> - <div v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;"> + <div v-for="(a, ai) in upHead" :key="ai+'yyyyy'" style="line-height: 50px;"> <el-col :span="6/data.row" style="text-align: right;" :offset="1"><span class="required-span" v-if="showAddReq(a.label)">* </span>{{a.value}}锛�</el-col> @@ -251,7 +252,7 @@ <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null" :multiple="data.selectField[a.label].choose" style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable filterable> - <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value" + <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'hhhh'" :value="b.value" :label="b.label"></el-option> </el-select> <el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)" @@ -270,7 +271,7 @@ </div> </div> <div v-else> - <el-row v-for="(a, ai) in upHead" :key="ai" style="line-height: 50px;"> + <el-row v-for="(a, ai) in upHead" :key="ai+'jjjjj'" style="line-height: 50px;"> <el-col :span="6" style="text-align: right;"><span class="required-span" v-if="showAddReq(a.label)">* </span>{{a.value}}锛�</el-col> <el-col :span="16" :offset="1"> @@ -279,7 +280,7 @@ <el-select v-model="upData[a.label]" size="small" v-if="showType(a.label, data.selectField) != null" :multiple="data.selectField[a.label].choose" style="width: 100%;" :placeholder="`璇烽�夋嫨${a.value}`" clearable> - <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi" :value="b.value" + <el-option v-for="(b, bi) in data.selectField[a.label].select" :key="bi+'mmmmmm'" :value="b.value" :label="b.label"></el-option> </el-select> <el-upload :action="javaApi+data.addUploadConfig.url" v-if="showUpload(a.label)" -- Gitblit v1.9.3