合并

src/views/contract/bidCost/index.vue

@@ -32,15 +32,6 @@
           <el-form-item>
             <el-button type="primary" @click="handleExport()" v-hasPermi="['bidding:biddingLimitList:export']">导出excel</el-button>
           </el-form-item>
-          <el-form-item>
-            <el-button
-              type="primary"
-              :disabled="versionObj.status && versionObj.status != 'draft'"
-              @click="handleSave(null, 'all')"
-              v-hasPermi="['tender:billofquantitiesLimitList:edit']"
-              >一键确定</el-button
-            >
-          </el-form-item>
           <el-form-item>
             <el-button
               type="primary"
@@ -69,7 +60,11 @@
         <el-table-column prop="num" label="编号" />
         <el-table-column prop="name" label="工程或费用名称" />
         <el-table-column prop="unit" label="单位" />
-        <el-table-column prop="quantity" label="数量" />
+        <el-table-column prop="quantity" label="数量">
+          <template #default="scope">
+            {{ scope.row.children.length > 0 ? '' : scope.row.quantity }}
+          </template>
+        </el-table-column>
         <el-table-column prop="remark" label="单价" align="center">
           <template #default="scope">
             <el-input-number
@@ -99,7 +94,7 @@
               type="primary"
               size="small"
               :disabled="versionObj.status != 'draft'"
-              @click="handleSave(scope.row, 'single')"
+              @click="handleSave(scope.row, 'all')"
               v-if="scope.row.quantity && scope.row.quantity != 0"
               v-hasPermi="['bidding:biddingLimitList:edit']"
               >确定</el-button

src/views/contract/limitPrice/index.vue

@@ -35,15 +35,7 @@
           <el-form-item>
             <el-button type="primary" @click="handleExport()" v-hasPermi="['tender:billofquantitiesLimitList:export']">导出excel</el-button>
           </el-form-item>
-          <el-form-item>
+
-            <el-button
-              type="primary"
-              :disabled="reviewStatus && reviewStatus != 'draft'"
-              @click="handleSave(null, 'all')"
-              v-hasPermi="['tender:billofquantitiesLimitList:edit']"
-              >一键确定</el-button
-            >
-          </el-form-item>
           <el-form-item>
             <el-button type="primary" v-if="reviewStatus && reviewStatus == 'draft'" @click="clickApprovalSheet()">审核</el-button>
           </el-form-item>
@@ -65,7 +57,11 @@
         <el-table-column prop="num" label="编号" />
         <el-table-column prop="name" label="工程或费用名称" />
         <el-table-column prop="unit" label="单位" />
-        <el-table-column prop="quantity" label="数量" />
+        <el-table-column prop="quantity" label="数量">
+          <template #default="scope">
+            {{ scope.row.children.length > 0 ? '' : scope.row.quantity }}
+          </template>
+        </el-table-column>
         <el-table-column prop="unitPrice" label="单价" align="center">
           <template #default="scope">
             <el-input-number
@@ -97,7 +93,7 @@
               type="primary"
               size="small"
               :disabled="reviewStatus != 'draft'"
-              @click="handleSave(scope.row, 'single')"
+              @click="handleSave(scope.row, 'all')"
               v-if="scope.row.quantity && scope.row.quantity != 0"
               v-hasPermi="['tender:billofquantitiesLimitList:edit']"
               >确定</el-button

src/views/formalities/formalitiesAreConsolidated/index.vue

@@ -48,11 +48,20 @@
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="handleAdd()" v-hasPermi="['formalities:listOfFormalities:add']">新增</el-button>
+            <span style="margin-left: 10px"
+              ><el-tooltip class="box-item" effect="dark" content="从原有模板列表选择新增" placement="top">
+                <el-icon color="#409efc"><WarningFilled /></el-icon> </el-tooltip
+            ></span>
           </el-col>
           <el-col :span="1.5">
             <el-button type="primary" plain icon="Plus" @click="addTemplate()" v-hasPermi="['formalities:formalitiesAreConsolidated:addFormalities']"
-              >新增模版</el-button
+              >新增数据</el-button
             >
+            <span style="margin-left: 10px">
+              <el-tooltip class="box-item" effect="dark" content="创建新模板并添加数据" placement="top">
+                <el-icon color="#409efc"><WarningFilled /></el-icon>
+              </el-tooltip>
+            </span>
           </el-col>
           <el-col :span="1.5">
             <el-button

src/views/tender/bidd/index.vue

@@ -22,15 +22,7 @@
               <el-form-item>
                 <el-button type="primary" @click="toggleExpandAll(false)">一键收起</el-button>
               </el-form-item>
-              <el-form-item>
+
-                <el-button
-                  type="primary"
-                  :disabled="versionsData.status != 'draft'"
-                  @click="handleSave(null, 'all')"
-                  v-hasPermi="['tender:tenderPlanLimitList:edit']"
-                  >一键确定</el-button
-                >
-              </el-form-item>
               <el-form-item>
                 <el-upload
                   ref="uploadRef"
@@ -73,7 +65,11 @@
             <el-table-column prop="num" label="编号" />
             <el-table-column prop="name" label="工程或费用名称" />
             <el-table-column prop="unit" label="单位" />
-            <el-table-column prop="quantity" label="数量" />
+            <el-table-column prop="quantity" label="数量">
+              <template #default="scope">
+                {{ scope.row.children.length > 0 ? '' : scope.row.quantity }}
+              </template>
+            </el-table-column>
             <el-table-column prop="remark" label="单价" align="center">
               <template #default="scope">
                 <el-input-number
@@ -102,7 +98,7 @@
                 <el-button
                   type="primary"
                   size="small"
-                  @click="handleSave(scope.row, 'single')"
+                  @click="handleSave(scope.row, 'all')"
                   v-if="scope.row.quantity && scope.row.quantity != 0"
                   v-hasPermi="['tender:tenderPlanLimitList:edit']"
                   :disabled="versionsData.status != 'draft'"