Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/assets/styles/ruoyi.scss

@@ -327,7 +327,7 @@
   margin-top: 15px
 }
 
-.right-search{
+.left-search{
   position: relative;
   float: left;
   margin-top: 15px

src/views/basic/workplace/busTypeManage.vue

@@ -85,7 +85,7 @@
           </template>
         </el-table-column>
         <el-table-column label="业务顺号" prop="number" width="100"></el-table-column>
-        <el-table-column label="备注:" prop="remark" width="100"></el-table-column>
+        <el-table-column label="备注" prop="remark" width="100"></el-table-column>
         <!--                <el-table-column label="往来单位类型" prop="corpType" width="100">-->
         <!--                  <template slot-scope="scope">-->
         <!--                    <span>{{ corpTypeMap[scope.row.corpType] }}</span>-->
@@ -93,7 +93,7 @@
         <!--                </el-table-column>-->
         <!--                <el-table-column label="往来类型标题" prop="unitTittle" width="100"></el-table-column>-->
         <!--                <el-table-column label="默认仓库 " prop="invName"></el-table-column>-->
-        <el-table-column label="操作" fixed="right" width="120">
+        <el-table-column label="操作" fixed="right" width="110">
           <template slot-scope="scope">
             <el-button
               type="text"

src/views/basic/workplace/workplaceManage.vue

@@ -86,7 +86,7 @@
                   <el-form-item label="工位状态:" class="query-form-item">
                     <el-select v-model="query.workplaceStatus" placeholder="工位状态" clearable>
                       <el-option label="暂停" :value="0"></el-option>
-                      <el-option label="在用" :value="1"></el-option>
+                      <el-option label="启用" :value="1"></el-option>
                     </el-select>
                   </el-form-item>
 
@@ -906,7 +906,7 @@ export default {
         workplaceStatus: 1,
         deptCode: null,
         chargeUser: null,
-        constituencies: null,
+        constituencies: "1001",
         invRemindNumber: 0,
         remake: null
       }

src/views/collect/CollectOrderAllotCardComponents.vue

@@ -90,7 +90,7 @@
           </template>
         </el-row>
       </el-form>
-      <div class="right-search" v-if="!showSearch">
+      <div class="left-search" v-if="!showSearch">
         <!-- 关键字搜索 按需配置 -->
         <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px">
           <el-row style=" display:flex;  flex-wrap: wrap; ">

src/views/collect/CollectOrderNew.vue

@@ -81,14 +81,16 @@
           </template>
         </el-row>
       </el-form>
-      <div class="right-search" v-if="!showSearch">
+      <div class="left-search" v-if="!showSearch">
         <!-- 关键字搜索 按需配置 -->
-        <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px">
+        <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"
+                 label-width="100px">
           <el-row style=" display:flex;  flex-wrap: wrap; ">
             <template v-for="(item, index) in queryList">
-              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"
-                            class="query-form-item"
-                            :label="item.columnDesc+`:`" :key="item.id">
+              <el-form-item
+                v-if="item.columnType == 'input' && executeEval(row,item.expression,true) && item.columnName == 'keywords'"
+                class="query-form-item"
+                :label="item.columnDesc+`:`" :key="item.id">
                 <el-input
                   v-model="filterQuery[item.columnName]"
                   :placeholder="item.columnDesc"
@@ -129,8 +131,8 @@
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
-      <!--<el-tabs type="border-card" style="margin-top: 55px">-->
-      <!--  <el-tab-pane label="原始单据">-->
+      <el-tabs type="border-card" style="margin-top: 55px">
+        <el-tab-pane label="原始单据">
 
           <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
                     @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable"
@@ -239,123 +241,117 @@
             :page.sync="filterQuery.page"
             @pagination="handleCurrentChange"
           ></pagination>
+        </el-tab-pane>
+        <el-tab-pane label="异常单据">
+          <el-table v-loading="loading" :data="errList" style="width: 100%;" border highlight-current-row
+                    @row-click="(row) => executeFuc(row,'0',tableObj1.handleChangeFuc)" ref="multipleTable"
+                    :default-sort="defaultSort"
+                    :row-style="{ height: '32px' }"
+                    @sort-change="handleSortChange">
+            <template v-for="(item, index) in tableHeader1">
+              <el-table-column
+                v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+                type="index" :label="item.columnDesc"></el-table-column>
+              <el-table-column
+                v-if="item.columnType == 'selection'"
+                type="selection"
+                :width="item.width"
+                :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+              ></el-table-column>
 
-
-        <!--</el-tab-pane>-->
-
-        <!--<el-tab-pane label="异常单据">-->
-
-        <!--  <el-table v-loading="loading" :data="errList" style="width: 100%;" border highlight-current-row-->
-        <!--            @row-click="(row) => executeFuc(row,'0',tableObj1.handleChangeFuc)" ref="multipleTable"-->
-        <!--            :default-sort="defaultSort"-->
-        <!--            :row-style="{ height: '32px' }"-->
-        <!--            @sort-change="handleSortChange">-->
-        <!--    <template v-for="(item, index) in tableHeader1">-->
-        <!--      <el-table-column-->
-        <!--        v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"-->
-        <!--        type="index" :label="item.columnDesc"></el-table-column>-->
-        <!--      <el-table-column-->
-        <!--        v-if="item.columnType == 'selection'"-->
-        <!--        type="selection"-->
-        <!--        :width="item.width"-->
-        <!--        :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"-->
-        <!--      ></el-table-column>-->
-
-        <!--      <el-table-column-->
-        <!--        v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"-->
-        <!--        :prop="item.columnName"-->
-        <!--        :label="item.columnDesc"-->
-        <!--        :sortable="item.sort"-->
-        <!--        :width="item.width"-->
-        <!--        :show-overflow-tooltip="item.tooltip"-->
-        <!--        :key="item.columnName"-->
-        <!--      >-->
-        <!--        <template slot-scope="scope">-->
-        <!--          <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>-->
-        <!--        </template>-->
-        <!--      </el-table-column>-->
-        <!--      <el-table-column-->
-        <!--        v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"-->
-        <!--        :prop="item.columnName"-->
-        <!--        :label="item.columnDesc"-->
-        <!--        :sortable="item.sort"-->
-        <!--        :width="item.width"-->
-        <!--        :show-overflow-tooltip="item.tooltip"-->
-        <!--        :key="item.columnName"-->
-        <!--      >-->
-        <!--        <template slot-scope="scope">-->
-        <!--    <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{-->
-        <!--        item.lableRuleObj[scope.row[item.columnName]]-->
-        <!--      }}</span>-->
-        <!--        </template>-->
-        <!--      </el-table-column>-->
-        <!--      <el-table-column-->
-        <!--        v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"-->
-        <!--        :prop="item.columnName"-->
-        <!--        :label="item.columnDesc"-->
-        <!--        :sortable="item.sort"-->
-        <!--        :width="item.width"-->
-        <!--        :show-overflow-tooltip="item.tooltip"-->
-        <!--        :key="item.columnName"-->
-        <!--      >-->
-        <!--        <template slot-scope="scope">-->
-        <!--          <el-tag-->
-        <!--            :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">-->
-        <!--      <span>{{-->
-        <!--          item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]-->
-        <!--        }}</span>-->
-        <!--          </el-tag>-->
-        <!--        </template>-->
-        <!--      </el-table-column>-->
-        <!--      <el-table-column-->
-        <!--        v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"-->
-        <!--        :prop="item.columnName"-->
-        <!--        :label="item.columnDesc"-->
-        <!--        :width="item.width"-->
-        <!--        :key="item.columnName"-->
-        <!--        fixed="right"-->
-        <!--      >-->
-        <!--        <template slot-scope="scope">-->
-        <!--          <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"-->
-        <!--                     :type="buttonItem.type"-->
-        <!--                     :size="buttonItem.size"-->
-        <!--                     :style="buttonItem.style"-->
-        <!--                     :key="buttonItem"-->
-        <!--                     v-if="executeEval(scope.row,buttonItem.hasPermi,true)"-->
-        <!--                     :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"-->
-        <!--                     @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"-->
-        <!--          >{{ buttonItem.name }}-->
-        <!--          </el-button>-->
-        <!--        </template>-->
-        <!--      </el-table-column>-->
-        <!--      <el-table-column-->
-        <!--        v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"-->
-        <!--        :prop="item.columnName"-->
-        <!--        :label="item.columnDesc"-->
-        <!--        :sortable="item.sort"-->
-        <!--        :width="item.width"-->
-        <!--        :show-overflow-tooltip="item.tooltip"-->
-        <!--        :key="item.columnName"-->
-        <!--      >-->
-        <!--        <template slot-scope="scope">-->
-        <!--    <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{-->
-        <!--        scope.row[item.columnName]-->
-        <!--      }}</span>-->
-        <!--        </template>-->
-        <!--      </el-table-column>-->
-        <!--    </template>-->
-        <!--  </el-table>-->
-        <!--  <pagination-->
-        <!--    v-show="errTotal>0"-->
-        <!--    :total="errTotal"-->
-        <!--    :limit.sync="errQuery.limit"-->
-        <!--    :page.sync="errQuery.page"-->
-        <!--    @pagination="handleCurrentChange"-->
-        <!--  ></pagination>-->
-
-
-        <!--</el-tab-pane>-->
-      <!--</el-tabs>-->
+              <el-table-column
+                v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+                :prop="item.columnName"
+                :label="item.columnDesc"
+                :sortable="item.sort"
+                :width="item.width"
+                :show-overflow-tooltip="item.tooltip"
+                :key="item.columnName"
+              >
+                <template slot-scope="scope">
+                  <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+                </template>
+              </el-table-column>
+              <el-table-column
+                v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+                :prop="item.columnName"
+                :label="item.columnDesc"
+                :sortable="item.sort"
+                :width="item.width"
+                :show-overflow-tooltip="item.tooltip"
+                :key="item.columnName"
+              >
+                <template slot-scope="scope">
+            <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
+                item.lableRuleObj[scope.row[item.columnName]]
+              }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+                :prop="item.columnName"
+                :label="item.columnDesc"
+                :sortable="item.sort"
+                :width="item.width"
+                :show-overflow-tooltip="item.tooltip"
+                :key="item.columnName"
+              >
+                <template slot-scope="scope">
+                  <el-tag
+                    :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+              <span>{{
+                  item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+                }}</span>
+                  </el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column
+                v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+                :prop="item.columnName"
+                :label="item.columnDesc"
+                :width="item.width"
+                :key="item.columnName"
+                fixed="right"
+              >
+                <template slot-scope="scope">
+                  <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                             :type="buttonItem.type"
+                             :size="buttonItem.size"
+                             :style="buttonItem.style"
+                             :key="buttonItem"
+                             v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                             :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                             @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+                  >{{ buttonItem.name }}
+                  </el-button>
+                </template>
+              </el-table-column>
+              <el-table-column
+                v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+                :prop="item.columnName"
+                :label="item.columnDesc"
+                :sortable="item.sort"
+                :width="item.width"
+                :show-overflow-tooltip="item.tooltip"
+                :key="item.columnName"
+              >
+                <template slot-scope="scope">
+            <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                scope.row[item.columnName]
+              }}</span>
+                </template>
+              </el-table-column>
+            </template>
+          </el-table>
+          <pagination
+            v-show="errTotal>0"
+            :total="errTotal"
+            :limit.sync="errQuery.limit"
+            :page.sync="errQuery.page"
+            @pagination="handleCurrentChange"
+          ></pagination>
+        </el-tab-pane>
+      </el-tabs>
 
 
     </el-card>

src/views/collect/DealOrder.vue

@@ -193,6 +193,23 @@
             :dangerouslyUseHTMLString="true"
             :description="result">
           </el-alert>
+          <el-alert
+            v-if="warnVisible"
+            title="警告信息:"
+            type="warning"
+            :closable="true"
+            :dangerouslyUseHTMLString="true"
+            :description="warnResult">
+          </el-alert>
+          <el-alert
+            v-if="errVisible"
+            title="错误信息:"
+            type="warning"
+            :closable="true"
+            :dangerouslyUseHTMLString="true"
+            :description="errResult">
+          </el-alert>
+
 
         </div>
         <el-descriptions title="单据信息" :column="4" border style="margin-top: 15px">
@@ -1165,6 +1182,12 @@ export default {
       let params = {
         codeList: event.detail.recCodes,
       };
+
+      if (this.formData.billNo == null) {
+        this.$message.error("请先选入单据！");
+        return
+      }
+
       //校验
       batchVailCode(params).then((res) => {
         if (res.code === 20000) {

src/views/collect/IoCreateOrder.vue

@@ -316,7 +316,7 @@ import {
   submitOrderWeb,
   saveOrderWeb,
   enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult, delmitBiz,
-  batchVailCode,batchAddCode
+  batchVailCode, batchAddCode
 } from "@/api/inout/order";
 import {filterSubAll, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
 import {parseTime} from "@/utils/coTools";
@@ -573,7 +573,7 @@ export default {
       curWorkPlace: null,
       fifoSplitEnable: false,
       scanDisabled: false,//是否禁用扫码输入框
-      valiCodes:[]
+      valiCodes: []
     };
   },
   components: {
@@ -1850,41 +1850,68 @@ export default {
         this.showSearch = true
       }
     },
-  //处理事件
+    //处理事件
     handleRecCodesEvent(event) {
-      console.log('接收 recCodes event:',event.detail.recCodes);
+      console.log('接收 recCodes event:', event.detail.recCodes);
       let params = {
-          codeList: event.detail.recCodes,
+        codeList: event.detail.recCodes,
       };
       //校验
       batchVailCode(params).then((response) => {
-          if (response.code === 20000) {
-            console.log("==滴码接收==",response.data);
-            this.valiCodes = [];
-            let list = response.data;
-            list.forEach(item => {
-              if (item.status === 1) {
-                  valiCodes.push(item.code);
+        if (response.code === 20000) {
+          console.log("==滴码接收==", response.data);
+          this.valiCodes = [];
+          let list = response.data;
+          list.forEach(item => {
+            if (item.status === 1) {
+              this.valiCodes.push(item.code);
+            }
+          });
+          //批量添加
+          if (this.valiCodes != null && this.valiCodes.length > 0) {
+            // let params2 = {
+            //   workPlaceCode: this.orderFormData.workPlaceCode,
+            //   codeList: this.valiCodes
+            // }
+            this.orderFormData.codeList = this.valiCodes
+            batchAddCode(this.orderFormData).then((res) => {
+              if (res.code === 20000) {
+                this.$refs.inputRef.focus();
+                this.refreshCodesPanel(this);
+                this.printMutiCodeResult(res.data.vailCodeResultResponses)
+              } else {
+                this.$message.error(res.message)
               }
             });
           }
-          this.scanCode = this.valiCodes.join(";");
-      });
-      //批量添加
-      if(this.valiCodes !=null && this.valiCodes.length > 0){
-        let params2 = {
-          workPlaceCode:this.orderFormData.workPlaceCode,
-          codeList:this.valiCodes
+
         }
-        batchAddCode(params2).then((res) => {
-          if (res.code === 20000) {
-            this.$message.success("添加成功")
-          }else{
-            this.$message.error(res.message)
-          }
+        // this.scanCode = this.valiCodes.join(";");
       });
+
+    },
+    async printMutiCodeResult(vailCodeResultResponses) {
+      this.warnVisible = false;
+      this.errVisible = false;
+      for (let i = 0; i < vailCodeResultResponses.length; i++) {
+        let data = vailCodeResultResponses[i]
+        if (data.status == 1)
+          this.result = this.result + ";" + vailCodeResultResponses[i].code;
+        else if (data.status == 2) {
+          this.warnResult = this.warnResult + "\n" + vailCodeResultResponses[i].code + ":" + vailCodeResultResponses[i].errMsg;
+        } else if (data.status == 3) {
+          this.result = this.result + "\n" + vailCodeResultResponses[i].code;
+          // this.warnResult = this.warnResult + "\n" + vailCodeResultResponses[i].code + ":" + vailCodeResultResponses[i].errMsg;
+          await this.popupTip(data)
+        }
+        // else
+        //   this.errResult = this.errResult + "\n" + vailCodeResultResponses[i].code + ":" + vailCodeResultResponses[i].errMsg;
       }
-    }
+      if (!isBlank(this.warnResult))
+        this.warnVisible = true;
+      if (!isBlank(this.errResult))
+        this.errVisible = true;
+    },
   },
   filters: {},
   mounted() {
@@ -1914,7 +1941,7 @@ export default {
     inputer.focus();
     this.$refs.inputRef.focus();
     //环境判断
-    if(window.navigator.userAgent.indexOf("GLXP_PC") != -1){
+    if (window.navigator.userAgent.indexOf("GLXP_PC") != -1) {
       this.scanDisabled = true;
       window.addEventListener('gwsh', this.handleRecCodesEvent);
     }

src/views/collect/PanelOrderDeal.vue

@@ -80,7 +80,7 @@
           </template>
         </el-row>
       </el-form>
-      <div class="right-search" v-if="!showSearch">
+      <div class="left-search" v-if="!showSearch">
         <!-- 关键字搜索 按需配置 -->
         <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px">
           <el-row style=" display:flex;  flex-wrap: wrap; ">

src/views/collect/PanelOrderEndSearch.vue

@@ -88,7 +88,7 @@
           </template>
         </el-row>
       </el-form>
-      <div class="right-search" v-if="!showSearch">
+      <div class="left-search" v-if="!showSearch">
         <!-- 关键字搜索 按需配置 -->
         <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px">
           <el-row style=" display:flex;  flex-wrap: wrap; ">

src/views/collect/PanelOrderUpload.vue

@@ -88,7 +88,7 @@
           </template>
         </el-row>
       </el-form>
-      <div class="right-search" v-if="!showSearch">
+      <div class="left-search" v-if="!showSearch">
         <!-- 关键字搜索 按需配置 -->
         <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px">
           <el-row style=" display:flex;  flex-wrap: wrap; ">