3/14 界面优化1.1

src/views/collect/CollectOrderTabs.vue

@@ -61,24 +61,24 @@
 
               <span slot="title">处理单据</span>
             </el-menu-item>
-            <el-menu-item :index=9 @click="clickMenuItem(9)" v-if="workPlaceClass == 1">
+            <!--<el-menu-item :index=9 @click="clickMenuItem(9)" v-if="workPlaceClass == 1">-->
 
-              <span slot="title">取药确认</span>
-            </el-menu-item>
+            <!--  <span slot="title">取药确认</span>-->
+            <!--</el-menu-item>-->
 
             <el-menu-item :index=10 @click="clickMenuItem(10)" v-if="workPlaceClass == 1">
 
               <span slot="title">单据审核</span>
             </el-menu-item>
 
-            <el-menu-item :index=4 @click="clickMenuItem(4)" v-if="workPlaceClass == 1">
+            <!--<el-menu-item :index=4 @click="clickMenuItem(4)" v-if="workPlaceClass == 1">-->
 
-              <span slot="title">待处理单</span>
-            </el-menu-item>
-            <el-menu-item :index=11 @click="clickMenuItem(11)" v-if="workPlaceClass == 1">
+            <!--  <span slot="title">待处理单</span>-->
+            <!--</el-menu-item>-->
+            <!--<el-menu-item :index=11 @click="clickMenuItem(11)" v-if="workPlaceClass == 1">-->
 
-              <span slot="title">单据校验</span>
-            </el-menu-item>
+            <!--  <span slot="title">单据校验</span>-->
+            <!--</el-menu-item>-->
             <el-menu-item :index=5 @click="clickMenuItem(5)" v-if="workPlaceClass == 1">
 
               <span slot="title">已完成单</span>
@@ -89,22 +89,22 @@
             </el-menu-item>
 
 
-            <el-menu-item :index=1 @click="clickMenuItem(1)" v-if="workPlaceClass == 2">
+            <el-menu-item :index=1 @click="clickMenuItem(1)" v-if="workPlaceClass == 2 && jobMode == 0">
 
               <span slot="title">工位上货</span>
             </el-menu-item>
-            <el-menu-item :index=15 @click="clickMenuItem(15)" v-if="workPlaceClass == 2">
+            <el-menu-item :index=15 @click="clickMenuItem(15)" v-if="workPlaceClass == 2 && jobMode == 1">
 
               <span slot="title">拆零上货</span>
             </el-menu-item>
-            <el-menu-item :index=16 @click="clickMenuItem(16)" v-if="workPlaceClass == 2">
+            <el-menu-item :index=16 @click="clickMenuItem(16)" v-if="workPlaceClass == 2 && jobMode == 1">
 
               <span slot="title">整取上货</span>
             </el-menu-item>
-            <el-menu-item :index=13 @click="clickMenuItem(13)" v-if="workPlaceClass == 2">
+            <!--<el-menu-item :index=13 @click="clickMenuItem(13)" v-if="workPlaceClass == 2">-->
 
-              <span slot="title">工位剔除</span>
-            </el-menu-item>
+            <!--  <span slot="title">工位剔除</span>-->
+            <!--</el-menu-item>-->
             <el-menu-item :index=8 @click="clickMenuItem(8)" v-if="workPlaceClass == 2">
 
               <span slot="title">上货推荐</span>
@@ -150,10 +150,10 @@
 
               <span slot="title">单据审核</span>
             </el-menu-item>
-            <el-menu-item :index=400 @click="clickMenuItem(400)" v-if="workPlaceClass == 1">
+            <!--<el-menu-item :index=400 @click="clickMenuItem(400)" v-if="workPlaceClass == 1">-->
 
-              <span slot="title">待处理单</span>
-            </el-menu-item>
+            <!--  <span slot="title">待处理单</span>-->
+            <!--</el-menu-item>-->
             <el-menu-item :index=500 @click="clickMenuItem(500)" v-if="workPlaceClass == 1">
 
               <span slot="title">已完成单</span>
@@ -167,10 +167,10 @@
 
               <span slot="title">工位上货</span>
             </el-menu-item>
-            <el-menu-item :index=1300 @click="clickMenuItem(1300)" v-if="workPlaceClass == 2">
+            <!--<el-menu-item :index=1300 @click="clickMenuItem(1300)" v-if="workPlaceClass == 2">-->
 
-              <span slot="title">工位剔除</span>
-            </el-menu-item>
+            <!--  <span slot="title">工位剔除</span>-->
+            <!--</el-menu-item>-->
             <el-menu-item :index=800 @click="clickMenuItem(800)" v-if="workPlaceClass == 2">
 
               <span slot="title">上货推荐</span>
@@ -738,7 +738,9 @@ export default {
       resetKeys: {},
       sendData: '',
       //默认业务类型 为药品 sys_workplace_document
-      productType: 2
+      productType: 2,
+      //作业模式
+      jobMode : 0,
     }
   },
   methods: {
@@ -1053,23 +1055,43 @@ export default {
   created() {
     this.workPlaceClass = this.$route.query.workPlaceClass
     this.productType = this.$route.query.productType
+    this.jobMode = this.$route.query.jobMode
     if (this.workPlaceClass == 2) {
       this.closeAllTabs()
       if (this.productType == 2){
-        this.editableTabsValue = 'IoCreateOrderOut'
-        this.menuActive = 1,
-          this.editableTabs = [{
-            number: 1,
-            title: '工位上货',
-            name: 'IoCreateOrderOut',
-            component: IoCreateOrderOut,
-            // 假设你需要传递的参数
-            componentProps: {
-              fromSplitType: 'out',
-              fifoSplitTag:0
+        if (this.jobMode == 0){
+          this.editableTabsValue = 'IoCreateOrderOut'
+          this.menuActive = 1,
+            this.editableTabs = [{
+              number: 1,
+              title: '工位上货',
+              name: 'IoCreateOrderOut',
+              component: IoCreateOrderOut,
+              // 假设你需要传递的参数
+              componentProps: {
+                fromSplitType: 'out',
+                fifoSplitTag:0
+              }
             }
-          }
-          ]
+            ]
+        }
+        if (this.jobMode == 1){
+          this.editableTabsValue = 'IoSplitCreateOrder'
+          this.menuActive = 15,
+            this.editableTabs = [{
+              number: 15,
+              title: '拆零上货',
+              name: 'IoSplitCreateOrder',
+              component: IoSplitCreateOrder,
+              // 假设你需要传递的参数
+              componentProps: {
+                fromSplitType: 'out',
+                fifoSplitTag:1
+              }
+            }
+            ]
+        }
+
       }else if (this.productType == 1){
         this.editableTabsValue = 'DevicesIoCreateOrderOut'
         this.menuActive = 100,
@@ -1103,6 +1125,7 @@ export default {
           ]
     }
 
+
     this.findCurWorkPlaces(this.$route.query.workplaceId)
     if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled = true

src/views/collect/ConfirmDrugDealOrder.vue

@@ -274,14 +274,14 @@
           <el-descriptions-item label="单据时间">{{ formData.billTime }}</el-descriptions-item>
           <!--          <el-descriptions-item label="单据备注">{{ formData.remark }}</el-descriptions-item>-->
 
-          <el-descriptions-item
-            label="灯组信息"
-          >
-            <!--colorStyle(formData.ledNum)-->
-            <!--<el-tag  style="color:red ">灯组信息</el-tag>-->
-            <el-tag  :type="colorStyle(formData.ledNum)">{{ledName}}</el-tag>
-            <el-tag  :type="colorStyle(formData.ledNum)" v-if="formData.ledNum != null">{{ledName}}</el-tag>
-          </el-descriptions-item>
+          <!--<el-descriptions-item-->
+          <!--  label="灯组信息"-->
+          <!--&gt;-->
+          <!--  &lt;!&ndash;colorStyle(formData.ledNum)&ndash;&gt;-->
+          <!--  &lt;!&ndash;<el-tag  style="color:red ">灯组信息</el-tag>&ndash;&gt;-->
+          <!--  <el-tag  :type="colorStyle(formData.ledNum)">{{ledName}}</el-tag>-->
+          <!--  <el-tag  :type="colorStyle(formData.ledNum)" v-if="formData.ledNum != null">{{ledName}}</el-tag>-->
+          <!--</el-descriptions-item>-->
         </el-descriptions>
 
         <div style="margin-top: 18px">

src/views/collect/DealOrder.vue

@@ -237,15 +237,18 @@
 
 
         </div>
-        <el-descriptions title="单据信息" :column="4" border style="margin-top: 15px" class="custom-descriptions">
+        <!--<el-descriptions title="单据信息" :column="4" border style="margin-top: 15px" class="custom-descriptions">-->
+          <el-descriptions :column="4" border style="margin-top: 5px">
           <!--{{ formData.billNo }}-->
-          <el-descriptions-item label="业务单号">
+          <!--<el-descriptions-item label="业务单号">-->
             <!--<svg ref="barcodeContainer" ></svg>-->
-            <div class="barcode-wrapper" >
-              <svg ref="barcodeContainer" v-show="formData.billNo != null"></svg>
-              <!--<span>{{ formData.billNo }}</span>-->
-            </div>
-          </el-descriptions-item>
+            <!--<div class="barcode-wrapper" >-->
+            <!--  <svg ref="barcodeContainer" v-show="formData.billNo != null"></svg>-->
+            <!--  &lt;!&ndash;<span>{{ formData.billNo }}</span>&ndash;&gt;-->
+            <!--</div>-->
+
+          <!--</el-descriptions-item>-->
+          <el-descriptions-item label="业务单号">{{ formData.billNo }}</el-descriptions-item>
           <el-descriptions-item label="发货方">{{ formData.shipperName }}</el-descriptions-item>
           <el-descriptions-item label="收货方">{{ formData.fromCorpName }}</el-descriptions-item>
           <el-descriptions-item label="单据类型">{{ formData.busTypeName }}</el-descriptions-item>
@@ -257,8 +260,8 @@
         <!--<svg ref="barcodeContainer"></svg>-->
       </el-card>
 
-      <el-tabs type="border-card" style="margin: 15px" v-model="editableTabsValue">
-        <el-tab-pane label="扫码详情" name="prescribeOriginPanel">
+      <el-tabs type="border-card" style="margin: 15px" v-model="editableTabsValue" v-show=" formData.billNo != null">
+        <!--<el-tab-pane label="扫码详情" name="prescribeOriginPanel">-->
           <prescribeOriginPanel
             v-if="panelALive"
             :prescribeData="curRow"
@@ -290,7 +293,7 @@
               </div>
             </el-col>
           </el-row>
-        </el-tab-pane>
+        <!--</el-tab-pane>-->
         <!--        <el-tab-pane label="扫码明细">-->
         <!--          <PanelOrderManuTagCode-->
         <!--            v-if="panelALive"-->

src/views/collect/IoCreateOrder.vue

@@ -48,7 +48,7 @@
             <!--</el-button>-->
             <el-button size="mini" type="primary" @click.native="delOrder()" :loading="submitLoading"
                        style="margin-right: 8px;border-radius: 5%;" v-show="isLinkDisabled"
-                       :disabled="orderFormData.billNo == null"
+                       :disabled="orderFormData.billNo == null && curQueueName == ''"
             >取消上货
             </el-button>
             <!--<el-button size="mini" type="primary" @click.native="draftOrder()" :loading="submitLoading"-->
@@ -1861,7 +1861,6 @@ export default {
       this.checkSuccess = true
       // this.workPlaceQueueCode = this.scanCode
       if (this.getDMHotskeyValue(this.scanCode)) {
-
         if (this.scanCode.includes("DMOENTER")) {
               this.submit()
           this.scanCode = ''
@@ -2089,7 +2088,7 @@ export default {
     },
 
     getDMHotskeyValue(str) {
-      console.log(str)
+      console.log("解析" , str)
       if (str.includes('DMHotskey')) {
         try {
           const jsonObj = JSON.parse(str)
@@ -2157,6 +2156,7 @@ export default {
         })
         return true
       }else if (str.includes("DMOENTER")) {
+        alert("hahhahahahha")
         return true
       }else if (str.includes("DMOCANCEL")) {
         return true
@@ -2506,7 +2506,6 @@ export default {
       this.ws.onmessage = function (event) {
         let scanData = event.data // 获取扫码数据
         let currentTime = Date.now()
-        console.log(scanData + "33333")
         // 如果时间间隔超过预设的阈值，表示这是一次新的扫码
         if (currentTime - lastScanTime > SCAN_TIMEOUT) {
           // 处理上一次完整的扫码数据

src/views/collect/PannelOrderBiz.vue

@@ -1,115 +1,150 @@
 <template>
   <div>
-    <el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border :row-style="rowStyle">
-      <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 v-loading="preLoading" :data="preDetailList" style="width: 100%" border :row-style="rowStyle">-->
+    <!--  <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'  && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && 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>
-        <el-table-column
-          v-if="item.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && 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])}">{{
-                    convertDateFun(scope.row[item.columnName])
-                  }}</span>
-          </template>
-        </el-table-column>
-      </template>
+    <!--    <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'  && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && 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>-->
+    <!--    <el-table-column-->
+    <!--      v-if="item.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && 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])}">{{-->
+    <!--                convertDateFun(scope.row[item.columnName])-->
+    <!--              }}</span>-->
+    <!--      </template>-->
+    <!--    </el-table-column>-->
+    <!--  </template>-->
+    <!--</el-table>-->
+
+    <el-table :data="preDetailList" highlight-current-row="true" border ref="multipleTable" :row-style="rowStyle">
+      <el-table-column label="产品通用名" prop="cpmctymc" width="240"></el-table-column>
+      <el-table-column label="制剂规格" prop="prepnSpec" width="280"></el-table-column>
+      <el-table-column label="包装规格" prop="spec" width="100"></el-table-column>
+      <el-table-column label="批次号" prop="batchNo" width="80"></el-table-column>
+      <el-table-column label="扫码数量" prop="scanActCount" width="80">
+        <template v-slot="scope">
+          <div :style="{ fontSize: '26px', }">{{ scope.row.scanActCount }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="单据数量" prop="count" width="80">
+        <template v-slot="scope">
+          <div :style="{ fontSize: '26px' }">{{ scope.row.count }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="工位库存" prop="tempWorkPlaceCount" width="80">
+        <template v-slot="scope">
+          <div :style="{ fontSize: '26px' }">{{ scope.row.tempWorkPlaceCount }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="拆零数量" prop="tempSplitCount" width="80">
+        <template v-slot="scope">
+          <div :style="{ fontSize: '26px' }">{{ scope.row.tempSplitCount }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column>
+      <el-table-column label="医保编码" prop="ybbm" width="240"></el-table-column>
+
+      <el-table-column label="操作" width="140" fixed="right">
+        <template slot-scope="scope">
+          <el-button type="primary"  icon="el-icon-document" @click="scanDetail(scope.row)"  >扫码明细</el-button>
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -285,9 +320,9 @@ export default {
     },
 
 
-    scanDetail(_this, row) {
-      _this.bizId = row.id;
-      _this.scanDetailVisible = true;
+    scanDetail( row) {
+      this.bizId = row.id;
+      this.scanDetailVisible = true;
     },
 
     closeScanDialog() {
@@ -297,7 +332,8 @@ export default {
 
     rowStyle({row, rowIndex}) {
       let rowBackground = {};
-
+      rowBackground.fontSize = '16px';
+      rowBackground.height = "50px";
       if (row.scanActCount < row.count) {
         rowBackground.color = '#F56C6C';
       }
@@ -307,7 +343,6 @@ export default {
       if (row.scanActCount >= row.count) {
         rowBackground.color = '#56a717';
       }
-      rowBackground.height = "38px"
       return rowBackground;
     },
 

src/views/collect/fieldOperation.vue

@@ -133,7 +133,7 @@ export default {
       getUserWorkByWorkplaceCode(query).then(res => {
         if (res.code == 20000){
           let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + this.stationList[index].workplaceId +`&workPlaceClass=`+ this.stationList[index].workPlaceClass
-            +`&productType=`+ this.stationList[index].productType
+            +`&productType=`+ this.stationList[index].productType + `&jobMode=` + this.stationList[index].jobMode
           // this.$router.push( workplaceId)
           window.open(url, '_blank');
         }else {