Merge branch 'qingban' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-CLIENT-TEMP into qingban

src/components/ExcelView/index.vue

@@ -271,6 +271,7 @@ defineExpose({
   addImg,
 });
 onMounted(() => {
+console.log(luckysheet)
   if (props.data == null) {
     inName.value = "表格模版";
     resetOb.value.data = resetdata;
@@ -282,6 +283,7 @@ onMounted(() => {
     resetOb.value.allowEdit = false;
   }
   luckysheet.create(resetOb.value);
+  console.log(luckysheet.getImageOption());
 });
 watch(
   () => props.verifications,

src/views/pro-steps/components/excel.vue

@@ -74,11 +74,14 @@
     </div>
     <div class="opeara">
       <div>
+        <div v-if="excelOptions.edit">
+          添加检验签章（请先点击需要添加的单元格）：
+        </div>
         <el-select
           v-model="imgUrl"
           placeholder="请先点击单元格后再行选择"
           size="large"
-          @change="QZchange"
+          v-if="excelOptions.edit"
         >
           <el-option
             v-for="item in options"
@@ -89,6 +92,13 @@
         </el-select>
         <el-button
           v-if="excelOptions.edit"
+          type="success"
+          class="btn"
+          @click="addImg"
+          >添加</el-button
+        >
+        <el-button
+          v-if="excelOptions.edit"
           type="primary"
           class="btn"
           @click="submitData"
@@ -121,8 +131,7 @@ const getUrlOption = async () => {
   });
   options.value = data.data.records;
 };
-
-const QZchange = () => {
+const addImg = () => {
   if (
     excelViewRef.value.selectCellValue.c &&
     excelViewRef.value.selectCellValue.r
@@ -132,7 +141,6 @@ const QZchange = () => {
     );
   } else {
     ElMessage.error("请先选择签章部署单元格");
-    imgUrl.value = "";
   }
 };
 const setting = ref([]);

src/views/pro-steps/popUpView/xiangqingPopUp.vue

@@ -30,7 +30,7 @@
             batchNoOkSum
           }}&nbsp;批次,本次完成绑定<span style="color: green">
             &nbsp;
-            {{ tabledata.filter((item) => item.num == 0).length }} &nbsp;</span
+            {{ tabledata.filter((item) => item.num <= 0).length }} &nbsp;</span
           >批次 )
         </div>
         <el-divider style="margin-top: 20px !important" />
@@ -101,9 +101,9 @@
                         batchNoTableData[scope.$index].batchNo
                       )
                         ? false
-                        : tabledata[scope.$index].num == 0
+                        : tabledata[scope.$index].num <= 0
                           ? true
-                          : item.remainingNum == 0
+                          : item.remainingNum <= 0
                             ? true
                             : false
                     "
@@ -192,7 +192,7 @@
           管号列表(共 {{ seqList.length }} 个，完成绑定
           {{ seqNoOkSum }} 个，本次完成绑定<span style="color: green">
             &nbsp;
-            {{ seqNoDataList.filter((item) => item.remainingNum == 0).length }}
+            {{ seqNoDataList.filter((item) => item.remainingNum <= 0).length }}
             &nbsp;</span
           >个 )
         </div>
@@ -391,7 +391,8 @@ const setSeqNoList = (seqList) => {
       }
     }
     array[i].remainingNum = sum;
-    if (array[i].remainingNum == 0) {
+    if (array[i].remainingNum <= 0) {
+      array[i].remainingNum=0;
       array[i].ok = true;
     } else {
       array[i].ok = false;
@@ -480,7 +481,7 @@ const autoObj = (index, batchNo) => {
   let addSelectSeq = [];
   let lastSelectSeq = [];
   for (let i = 0; i < seqData.length; i++) {
-    if (needSum == 0) {
+    if (needSum <= 0) {
       break;
     }
     if (seqData[i].remainingNum > 0) {
@@ -616,13 +617,14 @@ const dataList = () => {
   emits("dataList");
 };
 const tableRowClassName1 = ({ row, rowIndex }) => {
-  if (row.num == 0) {
+  if (row.num <= 0) {
     return "success-row";
   } else {
   }
 };
 const tableRowClassName2 = ({ row, rowIndex }) => {
-  if (row.remainingNum == 0) {
+  if (row.remainingNum <= 0) {
+    row.remainingNum=0;
     return "success-row";
   } else {
   }