Merge branch 'dev' into pre-production

src/components/tablecmt/tablecmt.vue

@@ -57,7 +57,7 @@
               @keyup.enter="handleInput"
             />
             <el-select
-              v-if="column.type == 3 || column.type == 14"
+              v-else-if="column.type == 3 || column.type == 14"
               v-model="column.values"
               filterable
               class="m-2 selectbr"
@@ -74,7 +74,7 @@
             </el-select>
             <el-date-picker
               v-model="column.values"
-              v-if="column.type == 4"
+              v-else-if="column.type == 4"
               type="date"
               clearable
               style="width: auto; height: 23px !important"
@@ -83,7 +83,7 @@
             />
             <el-date-picker
               v-model="column.values"
-              v-if="column.type == 5"
+              v-else-if="column.type == 5"
               type="datetime"
               clearable
               style="width: auto"
@@ -108,7 +108,7 @@
             >
             <el-switch
               @change="makeCargo(scope.row, column)"
-              v-if="column.type == 11"
+              v-else-if="column.type == 11"
               v-model="scope.row[column.prop]"
             />
 
@@ -123,28 +123,27 @@
             <el-text
               style=""
               class="mx-2 tabculconte colors"
-              v-if="column.type == 9"
+              v-else-if="column.type == 9"
               @click="godowns(scope.row[column.downprop])"
               >{{ scope.row[column.prop] }}</el-text
             >
             <el-input
               @blur="handleNumberRange(column, scope.row)"
-              v-if="column.type == 10"
+              v-else-if="column.type == 10"
               v-model.trim="scope.row[column.prop]"
               type="number"
               :min="0"
               :max="scope.row.residueNumber"
             ></el-input>
-            <div class="slotbuts" v-if="column.type == 6 || column.type == 13 || column.type == 14">
+            <div
-              <slot
+              class="slotbuts"
-                v-if="column.type == 6 || column.type == 13 || column.type == 14"
+              v-else-if="column.type == 6 || column.type == 13 || column.type == 14"
-                :scope="scope"
+            >
-              >
+              <slot :scope="scope"> </slot>
-              </slot>
             </div>
             <el-image
               preview-teleported
-              v-if="column.type == 7"
+              v-else-if="column.type == 7"
               style="width: 60px; height: 60px; margin-left: 10px"
               :initial-index="index"
               :z-index="100"
@@ -152,24 +151,6 @@
               :src="item"
               :preview-src-list="scope.row[column.prop].split(',')"
             />
-            <!-- <el-tooltip placement="top" v-if="(Number(column.type)<6&&Number(column.type)>0)&&!column.isextrahide">
-            <template #content>{{ scope.row[column.prop] }}</template>
-            <div class="on tabculconte">{{ scope.row[column.prop] }}</div>
-          </el-tooltip> -->
-            <!-- <slot v-if="column.type == 7" name="test" :testdata="scope"></slot> -->
-            <!-- <el-button
-            v-if="column.type == 6"
-            size="small"
-            @click="handleEdit(scope.$index, scope.row)"
-            >Edit</el-button
-          >
-          <el-button
-            v-if="column.type == 6"
-            size="small"
-            type="danger"
-            @click="handleDelete(scope.$index, scope.row)"
-            >Delete</el-button
-          > -->
           </template>
         </el-table-column>
 
@@ -537,8 +518,8 @@ const handleSelectionChange = (param: TableDataType[]) => {
     selectarr.value = param;
     try {
       // 重置数据
-      for (const iterator of selectCount.value) {
+      for (let i = 0; i < selectCount.value.length; i++) {
-        iterator.value = 0;
+        selectCount.value[i].value = 0;
       }
 
       if (selectarr.value.length === 0) return;
@@ -546,8 +527,9 @@ const handleSelectionChange = (param: TableDataType[]) => {
       for (let index = 0; index < selectarr.value.length; index++) {
         const val = selectarr.value[index];
 
-        for (let item of selectCount.value) {
+        for (let j = 0; j < selectCount.value.length; j++) {
-          if (index === 0) item.value = 0;
+          const item = selectCount.value[j];
+
           item.value = computeNumber(item.value, '+', Number(val[item.prop] || 0)).result;
         }
       }
@@ -556,7 +538,7 @@ const handleSelectionChange = (param: TableDataType[]) => {
     } finally {
       emit('selection', param);
     }
-  }, 50);
+  }, 10);
 };
 // 计算是否清空表格复选框值
 const handleUserSelcet = list => {

src/views/system/client.vue

@@ -112,6 +112,10 @@ export default {
                 label: 'social',
                 value: 'social',
               },
+              {
+                label: 'local_server',
+                value: 'local_server',
+              },
             ],
             rules: [
               {
@@ -360,17 +364,17 @@ export default {
 };
 </script>
 
-<style scoped lang='scss'>
+<style scoped lang="scss">
-:deep(.no-print){
+:deep(.no-print) {
-  margin-left:auto;
+  margin-left: auto;
-  .el-button{
+  .el-button {
-     margin-right:0
+    margin-right: 0;
   }
 }
-:deep(.avue-form__row){	
+:deep(.avue-form__row) {
-  max-width:300px!important;
+  max-width: 300px !important;
 }
-:deep(.el-form-item__label){
+:deep(.el-form-item__label) {
-  width:auto !important;
+  width: auto !important;
 }
 </style>

src/views/waybill/TemporaryStorageList.vue

@@ -372,9 +372,11 @@
             drag
             :headers="details.header"
             :action="
-              details.ouPaiChooseType === 1 && details.orderStatus === 'haveData'
+              details.orderStatus === 'notHaveData'
+                ? '/api/logpm-trunkline/openOrder/importOrderNoPackage'
+                : details.ouPaiChooseType === 1
                 ? '/api/logpm-trunkline/openOrder/openLabelHasPacakage'
-                : '/api/logpm-trunkline/openOrder/importOrderNoPackage'
+                : '/api/logpm-trunkline/openOrder/batchOpenLabel'
             "
             :before-upload="handleBeforeUpload"
             :on-success="handleSuccess"