8*31 优化

src/views/basic/workplace/addBusTypeDialog.vue

@@ -156,6 +156,14 @@
       </el-row>
 
       <el-row :gutter="24" class="el-row">
+        <el-col :span="12" class="el-col">
+          <el-form-item label="独占工位库存:" prop="warnType" class="query-form-item">
+            <el-select v-model="formData.monopoly" style="width: 80%" placeholder="独占工位库存">
+              <el-option label="否" :value="0"></el-option>
+              <el-option label="是" :value="1"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
         <el-col :span="12" class="el-col">
           <el-form-item label="往来类型标题:" prop="unitTittle" class="query-form-item">
             <el-input
@@ -253,6 +261,7 @@ export default {
         warnType: 2,
         workplaceType: 3,
         autoTag: 0,
+        monopoly: 0,
       },
       invList: [],
       busTypes: [],

src/views/basic/workplace/workplaceManage.vue

@@ -210,7 +210,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column label="单据类型" prop="thrBusName" width="140"></el-table-column>
-                <el-table-column label="工位类型" prop="workplaceType" width="90">
+                <el-table-column label="作业类型" prop="workplaceType" width="90">
                   <template slot-scope="scope">
                     <span>{{ workplaceTypeMap[scope.row.workplaceType] }}</span>
                   </template>
@@ -220,6 +220,11 @@
                     <span>{{ autoTagTypes[scope.row.autoTag] }}</span>
                   </template>
                 </el-table-column>
+                <el-table-column label="独占库存" prop="monopoly" width="90">
+                  <template slot-scope="scope">
+                    <span>{{ monopolys[scope.row.monopoly] }}</span>
+                  </template>
+                </el-table-column>
                 <el-table-column label="计量单位 " prop="orderCirType" width="100">
                   <template slot-scope="scope">
                     <span>{{ orderCirTypes[scope.row.orderCirType] }}</span>
@@ -774,6 +779,10 @@ export default {
         1: '是',
         0: '否'
       },
+      monopolys: {
+        1: '是',
+        0: '否'
+      },
       corpTypeMap: {
         1: '客户',
         2: '供应商',

src/views/collect/IoCollectCodeSelect.vue

@@ -2,8 +2,9 @@
   <div>
     <el-card>
       <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
-               size="mini" label-width="100px">
-          <el-col :span="20">
+               size="mini" label-width="100px"
+      >
+        <el-col :span="20">
           <el-form-item prop="code" label="扫描追溯码:">
             <el-input
               ref="inputRef"
@@ -15,85 +16,93 @@
               clearable
             ></el-input>
           </el-form-item>
-          </el-col>
-          <template v-for="(item, index) in queryList">
-            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`" :key="item.id">
-              <el-input
-                v-model="filterQuery[item.columnName]"
-                :placeholder="item.columnDesc"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`">
-              <el-select v-model="filterQuery[item.columnName]"
-                         :placeholder="item.columnDesc"
-                         :disabled="executeEval(null,item.disabledFuc,false)"
-                         clearable>
-                <el-option
-                  v-for="dict in item.lableRuleObj"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`">
-              <el-select
-                v-model="filterQuery[item.columnName]"
-                :placeholder="item.columnDesc"
-                @change="executeFuc($event,'5',item.checkRules)"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                filterable
-                remote
-                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
-                clearable>
-                <el-option
-                  v-for="item in options[item.clickFuc]"
-                  :key="item.code"
-                  :label="item.label"
-                  :value="item.code"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`">
-              <el-date-picker
-                :picker-options="pickerOptions"
-                v-model="actDateRange"
-                type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
-            </el-form-item>
-            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`">
-              <el-date-picker
-                v-model="filterQuery[item.columnName]"
-                :style="`width:${item.width+'px'}`"
-                value-format="yyyy-MM-dd"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                type="date"
-                :placeholder="item.columnDesc"
-              ></el-date-picker>
-            </el-form-item>
-          </template>
+        </el-col>
+        <template v-for="(item, index) in queryList">
+          <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                        class="query-form-item"
+                        :label="item.columnDesc+`:`" :key="item.id"
+          >
+            <el-input
+              v-model="filterQuery[item.columnName]"
+              :placeholder="item.columnDesc"
+              :disabled="executeEval(null,item.disabledFuc,false)"
+              @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+              clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                        class="query-form-item"
+                        :label="item.columnDesc+`:`"
+          >
+            <el-select v-model="filterQuery[item.columnName]"
+                       :placeholder="item.columnDesc"
+                       :disabled="executeEval(null,item.disabledFuc,false)"
+                       clearable
+            >
+              <el-option
+                v-for="dict in item.lableRuleObj"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                        class="query-form-item"
+                        :label="item.columnDesc+`:`"
+          >
+            <el-select
+              v-model="filterQuery[item.columnName]"
+              :placeholder="item.columnDesc"
+              @change="executeFuc($event,'5',item.checkRules)"
+              :disabled="executeEval(null,item.disabledFuc,false)"
+              filterable
+              remote
+              :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+              clearable
+            >
+              <el-option
+                v-for="item in options[item.clickFuc]"
+                :key="item.code"
+                :label="item.label"
+                :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                        class="query-form-item"
+                        :label="item.columnDesc+`:`"
+          >
+            <el-date-picker
+              :picker-options="pickerOptions"
+              v-model="actDateRange"
+              type="daterange"
+              format="yyyy 年 MM 月 dd 日"
+              value-format="yyyy-MM-dd"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                        class="query-form-item"
+                        :label="item.columnDesc+`:`"
+          >
+            <el-date-picker
+              v-model="filterQuery[item.columnName]"
+              :style="`width:${item.width+'px'}`"
+              value-format="yyyy-MM-dd"
+              :disabled="executeEval(null,item.disabledFuc,false)"
+              type="date"
+              :placeholder="item.columnDesc"
+            ></el-date-picker>
+          </el-form-item>
+        </template>
+
       </el-form>
       <div class="top-right-btn">
         <el-button-group>
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <!--<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>-->
           <el-button
             type="primary"
             icon="el-icon-refresh"
@@ -106,117 +115,123 @@
           >
         </el-button-group>
       </div>
+
       <el-divider style="margin: 15px"></el-divider>
 
-      <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
-                @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable"
-                :default-sort="defaultSort"
-                :row-style="{ height: '32px' }"
-                @selection-change="handleSelectionChange"
-                @sort-change="handleSortChange">
-        <template v-for="(item, index) in tableHeader">
-          <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>
+      <div v-if="false">
+        <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
+                  @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable"
+                  :default-sort="defaultSort"
+                  :row-style="{ height: '32px' }"
+                  @selection-change="handleSelectionChange"
+                  @sort-change="handleSortChange"
+        >
+          <template v-for="(item, index) in tableHeader">
+            <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">
+            <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])">
+              </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">
+                </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>
+              </template>
+            </el-table-column>
+          </template>
+        </el-table>
 
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :limit.sync="filterQuery.limit"
-        :page.sync="filterQuery.page"
-        @pagination="handleCurrentChange"
-      ></pagination>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :limit.sync="filterQuery.limit"
+          :page.sync="filterQuery.page"
+          @pagination="handleCurrentChange"
+        ></pagination>
+      </div>
     </el-card>
 
     <el-dialog
@@ -234,14 +249,15 @@
 </template>
 
 <script>
-import {executeFuc, getHead} from "@/utils/customConfig";
-import {convertDate} from "@/utils/date";;
-import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
+import { executeFuc, getHead } from '@/utils/customConfig'
+import { convertDate } from '@/utils/date'
+
+import { deleteByOrder, orderPage } from '@/api/collect/collectOrder'
 import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
 import { IoCollectCodePage } from '@/api/collect/IoCollectCodeSelect'
 
 export default {
-  name: "IoCollectCodeSelect",
+  name: 'IoCollectCodeSelect',
   data() {
     return {
       //界面配置相关
@@ -256,9 +272,9 @@ export default {
       showSearch: true,
       filterQuery: {
         page: 1,
-        limit: 10,
+        limit: 10
       },
-      defaultSort: {prop: 'createTime', order: 'desc'},
+      defaultSort: { prop: 'createTime', order: 'desc' },
       loading: false,
       list: [],
       total: 0,
@@ -269,7 +285,7 @@ export default {
       preQuery: {
         prescribeCode: null,
         page: 1,
-        limit: 10,
+        limit: 10
       },
 
       preDiLoading: false,
@@ -278,7 +294,7 @@ export default {
       preDiQuery: {
         prescribeCode: null,
         page: 1,
-        limit: 10,
+        limit: 10
       },
 
       curRow: null,
@@ -286,32 +302,32 @@ export default {
       multiplePreSelection: [],
       timer: null, // 定时器
       options: {
-        findWorkPlace: [],
+        findWorkPlace: []
       },
       checkDetailVisible: false
     }
   },
   methods: {
     //启动定时器
-    timerAuto() {
-      //启动定时器
-      this.timer = setInterval(() => {
-        //查询订单是否支付成功
-        this.getList()
-      }, 10000)
-
-      //清楚定时器的方法
-      // clearInterval(this.timer)
-    },
+    // timerAuto() {
+    //   //启动定时器
+    //   this.timer = setInterval(() => {
+    //     //查询订单是否支付成功
+    //     this.getList()
+    //   }, 10000)
+    //
+    //   //清楚定时器的方法
+    //   // clearInterval(this.timer)
+    // },
     //界面配置相关------------
     executeFuc(row, type, clickFuc, value) {
-      return executeFuc(this, row, type, clickFuc, value);
+      return executeFuc(this, row, type, clickFuc, value)
     },
     executeEval(row, expression, defaultRet) {
       if (expression) {
-        return eval(expression);
+        return eval(expression)
       }
-      return defaultRet;
+      return defaultRet
     },
     handleSortChange(column, prop, order) {
       if (column.order === 'descending') {
@@ -319,30 +335,31 @@ export default {
       } else {
         this.query.sort = 'asc'
       }
-      this.query.orderBy = column.prop;
-      this.getList();
+      this.query.orderBy = column.prop
+      this.getList()
     },
     ///界面配置相关------------end
 
     hideSearch() {
-      this.showSearch = !this.showSearch;
+      this.showSearch = !this.showSearch
     },
     onReset() {
-      this.filterQuery = {};
-      this.actDateRange = [];
-      this.getList();
+      this.filterQuery = {}
+      this.actDateRange = []
+      this.getList()
     },
     closeDialog() {
-      this.bindWorkPlaceVisible = false;
-      this.getList();
+      this.bindWorkPlaceVisible = false
+      this.getList()
     },
     onSubmit() {
-      this.filterQuery.page = 1;
-      this.getList();
+      this.filterQuery.page = 1
+      // let h  = this.hasOtherProperties(this.filterQuery)
+      this.getList()
     },
 
     getList() {
-      this.loading = true;
+      this.loading = true
       IoCollectCodePage(this.filterQuery).then(res => {
         this.loading = false
         this.list = res.data.list || []
@@ -354,26 +371,26 @@ export default {
       })
     },
     handleCurrentChange(val) {
-      this.filterQuery.page = val.page;
-      this.getList();
+      this.filterQuery.page = val.page
+      this.getList()
     },
 
     deleteDialog(_this, row) {
-      _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      _this.$confirm('此操作将永久删除该订单, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
         })
         .catch(() => {
-        });
+        })
     },
-    handleCheckDetail(_this, row){
+    handleCheckDetail(_this, row) {
       _this.checkDetailVisible = true
     },
     handleSelectionChange(val) {
-      this.multiplePreSelection = val;
+      this.multiplePreSelection = val
     },
 
     findWorkPlace(_this, val) {
@@ -381,47 +398,58 @@ export default {
         chargeUser: _this.$store.getters.adminId,
         key: val,
         page: 1,
-        limit: 10,
+        limit: 10
       }
       filterWorkOptimize(query)
         .then((response) => {
-          _this.loading = false;
-          _this.options.findWorkPlace = response.data || [];
-          if (_this.options.findWorkPlace .length == 1){
-            _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code;
+          _this.loading = false
+          _this.options.findWorkPlace = response.data || []
+          if (_this.options.findWorkPlace.length == 1) {
+            _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code
           }
         })
         .catch(() => {
-          _this.loading = false;
-          _this.options.findWorkPlace = [];
-        });
+          _this.loading = false
+          _this.options.findWorkPlace = []
+        })
     },
 
     getInputFocus(event) {
-      event.currentTarget.select();
+      event.currentTarget.select()
     },
     enterKey(event) {
       this.getList()
-      this.$refs.inputRef.select();
+      this.$refs.inputRef.select()
     },
+
+    hasOtherProperties(filterQuery) {
+      // 获取对象的所有键
+      const keys = Object.keys(filterQuery)
+      // 排除已知的键
+      const knownKeys = ['page', 'limit']
+      // 过滤出除了已知键之外的其他键
+      const otherKeys = keys.filter(key => !knownKeys.includes(key))
+      // 如果有其他键，返回true，否则返回false
+      return otherKeys.length > 0
+    }
   },
   mounted() {
   },
   created() {
-    getHead("IoCollectCodeSelect", "1").then((re) => {
+    getHead('IoCollectCodeSelect', '1').then((re) => {
       // 处理返回的数据
-      this.tableObj = re.data;
-      this.tableHeader = re.data.tableList;
-      this.queryList = re.data.queryList;
-      this.fromList = re.data.fromList;
-      this.getList();
-      this.findWorkPlace(this,"");
-    });
-    this.timerAuto()
+      this.tableObj = re.data
+      this.tableHeader = re.data.tableList
+      this.queryList = re.data.queryList
+      this.fromList = re.data.fromList
+      // this.getList()
+      this.findWorkPlace(this, '')
+    })
+    // this.timerAuto()
   },
   destroyed() {
     clearInterval(this.timer)
-  },
+  }
 
 }
 </script>

src/views/collect/IoSplitFifoCodePanel.vue

@@ -429,6 +429,204 @@
           @pagination="getResultDetailList"
         />
       </el-tab-pane>
+      <el-tab-pane>
+        <span slot="label"> {{ currentRow.cpmctymc }}-拆零明细</span>
+        <el-form v-if="queryList5 && queryList5.length > 0" :inline="true" :model="resultQuery" class="query-form"
+                 size="mini">
+          <el-row style=" display:flex;  flex-wrap: wrap; ">
+            <template v-for="(item, index) in queryList5">
+              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                            :label="item.columnDesc+`:`" :key="item.id">
+                <el-input
+                  v-model="codeQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                            :label="item.columnDesc+`:`">
+                <el-select v-model="codeQuery[item.columnName]"
+                           :placeholder="item.columnDesc"
+                           :disabled="executeEval(null,item.disabledFuc,false)"
+                           clearable>
+                  <el-option
+                    v-for="dict in item.lableRuleObj"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                            :label="item.columnDesc+`:`">
+                <el-select
+                  v-model="codeQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  @change="executeFuc($event,'5',item.checkRules)"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  filterable
+                  remote
+                  :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                  clearable>
+                  <el-option
+                    v-for="item in options[item.clickFuc]"
+                    :key="item.code"
+                    :label="item.label"
+                    :value="item.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                            :label="item.columnDesc+`:`">
+                <el-date-picker
+                  :picker-options="pickerOptions"
+                  v-model="actDateRange"
+                  type="daterange"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                ></el-date-picker>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                            :label="item.columnDesc+`:`">
+                <el-date-picker
+                  v-model="codeQuery[item.columnName]"
+                  :style="`width:${item.width+'px'}`"
+                  value-format="yyyy-MM-dd"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  type="date"
+                  :placeholder="item.columnDesc"
+                ></el-date-picker>
+              </el-form-item>
+            </template>
+          </el-row>
+          <el-form-item>
+            <el-button-group>
+              <el-button
+                type="primary"
+                icon="el-icon-refresh"
+                @click="onCodeResultReset"
+              >重置
+              </el-button>
+              <el-button type="primary" @click="onCodeResultSubmit"
+                         icon="el-icon-search"
+              >查询
+              </el-button
+              >
+            </el-button-group>
+          </el-form-item>
+        </el-form>
+
+        <el-table v-loading="resultDetailLoading" :data="apartDetailList" style="width: 100%" border
+                  row-key="id"
+        >
+          <template v-for="(item, index) in tableHeader5">
+            <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="apartTotal>0"
+          :total="apartTotal"
+          :page.sync="codeQuery.page"
+          :limit.sync="codeQuery.limit"
+          @pagination="getResultDetailList"
+        />
+      </el-tab-pane>
     </el-tabs>
 
     <el-dialog
@@ -475,6 +673,7 @@ import { listPage } from '@/api/basic/workPlace/sysWorkplaceManage'
 import ioSplitFifoCodeRemindSetDialog from "./ioSplitFifoCodeRemindSetDialog.vue";
 import destroyOutDialog from "./destroyOutDialog.vue";
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import { getSplitCode } from '@/api/collect/collectOrder'
 
 export default {
   name: "IoSplitFifoCodePanel",
@@ -509,6 +708,9 @@ export default {
       tableHeader4: [],
       queryList4: [],
       fromList4: [],
+      tableHeader5: [],
+      queryList5: [],
+      fromList5: [],
       convertDateFun: convertDate,
       //界面配置-------------end
 
@@ -542,10 +744,17 @@ export default {
         page: 1,
         limit: 10
       },
+      codeQuery: {
+        code: null,
+        page: 1,
+        limit: 10
+      },
       currentRow: {},
       resultTotal: 0,
       resultDetailLoading: false,
       resultDetailList: [],
+      apartDetailList: [],//拆零明细
+      apartTotal: 0,//拆零明细
       addInvRemindSetDialogVisible: false,
       destroyOutDialogVisible: false,
       prescribeData: {},
@@ -656,6 +865,14 @@ export default {
       }
       _this.currentRow = row
       _this.getResultDetailList();
+      _this.codeQuery = {
+        relId: row.relId,
+        batchNo: row.batchNo,
+        workPlaceCode: row.workPlaceCode,
+        page: 1,
+        limit: 10
+      }
+      _this.getSplitCodeDetail();
     },
 
     getResultDetailList() {
@@ -671,7 +888,41 @@ export default {
       })
 
     },
-
+    getSplitCodeDetail(){
+      getSplitCode(this.codeQuery).then(res => {
+        if (res.code == 20000){
+          // this.loading = false
+          this.apartDetailList = res.data.list || []
+          this.apartTotal = res.data.total || 0
+        }
+      })
+        .catch(() => {
+          // this.loading = false
+          this.apartDetailList = []
+          this.apartTotal = res.data.total || 0
+      })
+    },
+    onCodeResultSubmit(){
+      this.codeQuery = {
+        code: this.codeQuery.code,
+        relId: this.currentRow.relId,
+        batchNo: this.currentRow.batchNo,
+        workPlaceCode: this.currentRow.workPlaceCode,
+        page: 1,
+        limit: 10
+      }
+      this.getSplitCodeDetail()
+    },
+    onCodeResultReset(){
+      this.codeQuery = {
+        relId: this.currentRow.relId,
+        batchNo: this.currentRow.batchNo,
+        workPlaceCode: this.currentRow.workPlaceCode,
+        page: 1,
+        limit: 10
+      }
+      this.getSplitCodeDetail()
+    },
 
     handleCurrentChange(val) {
       this.filterQuery.page = val.page;
@@ -758,6 +1009,13 @@ export default {
       this.queryList4 = re.data.queryList;
       this.fromList4 = re.data.fromList;
     });
+    getHead("ioSplitFifoCode-clmx", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj5 = re.data;
+      this.tableHeader5 = re.data.tableList;
+      this.queryList5 = re.data.queryList;
+      this.fromList5 = re.data.fromList;
+    });
     this.filterQuery.workPlaceCode = this.workPlaceCode
   }
 

src/views/collect/destroyOutDialog.vue

@@ -33,14 +33,14 @@
                ref="formRef">
         <el-row :gutter="24">
           <el-col :span="10">
-            <el-form-item label="损耗出库数量" prop="count">
+            <el-form-item label="损耗出库数量:" prop="count">
               <el-input v-model.number="formData.count" placeholder="请填写损耗出库数量" type="number" :min="1"
                         @input="checkCount"></el-input>
               <!--<span v-if="countExceeded" class="exceeded-message">损耗出库数量不能超过10个</span>-->
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="损耗出库说明">
+            <el-form-item label="损耗出库说明:">
               <el-input v-model="formData.remark" placeholder="请填写损耗出库说明" clearable></el-input>
             </el-form-item>
           </el-col>
@@ -137,8 +137,8 @@ export default {
             return this.$message.error(res.message)
           }
         })
-      } else if (this.destroyType == 1) {
-        destroySplitOut(query).then(res => {
+      } else if (this.destroyType == 2) {
+        destroyOutByCode(query).then(res => {
           if (res.code == 20000) {
             this.closeDialog()
             return this.$message.success("损耗出库成功")

src/views/collect/ioSplitFifoCodeRemindSetDialog.vue

@@ -3,7 +3,7 @@
     <el-form :model="formData" label-width="200px">
       <el-row>
         <el-col :span="10">
-          <el-form-item class="query-form-item" label="工位：">
+          <el-form-item class="query-form-item" label="当前工位：">
             <el-input v-model="formData.workPlaceName" disabled></el-input>
           </el-form-item>
         </el-col>
@@ -17,7 +17,7 @@
 
       <el-row>
         <el-col :span="10">
-          <el-form-item class="query-form-item" label="规格型号：">
+          <el-form-item class="query-form-item" label="产品规格：">
             <el-input v-model="formData.ggxh" disabled></el-input>
           </el-form-item>
         </el-col>
@@ -27,6 +27,13 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-row>
+        <el-col :span="10">
+          <el-form-item class="query-form-item" label="业务类型：">
+            <el-input v-model="formData.busTypeName" disabled></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
 
       <el-divider></el-divider>
       <el-row>
@@ -87,9 +94,14 @@ export default {
   methods: {
     getRemindSetInfo() {
       this.formData = this.prescribeData;
+      if (this.prescribeData.monopoly == 0){
+        this.formData.busTypeName = '共享库存'
+      }else {
+        this.formData.busTypeName = this.prescribeData.busName
+      }
     },
 
-    addInvRemindSet() {     
+    addInvRemindSet() {
       this.formLoading = true
       let param = {
         id:this.formData.id,