11/14 槽位管理

src/views/basic/workplace/workplaceQueue.vue

@@ -18,11 +18,90 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList">
+            <div v-if="showSearch || item.isImport">
+              <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="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)"
+                            class="query-form-item"
+                            :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)"-->
+              <!--              class="query-form-item"-->
+              <!--              :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)"
+                            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="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>
+            </div>
+          </template>
+        </el-row>
       </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-plus" @click="addBind"
           >维护绑定关系
           </el-button>
@@ -45,8 +124,8 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="出货槽编号" prop="code" show-overflow-tooltip width="160"></el-table-column>
         <!--<el-table-column label="货架名称" prop="name" show-overflow-tooltip width="160"></el-table-column>-->
-        <el-table-column label="产品ID" prop="relId" show-overflow-tooltip width="160"></el-table-column>
+        <!--<el-table-column label="产品ID" prop="relId" show-overflow-tooltip width="160"></el-table-column>-->
-        <el-table-column label="DI标识" prop="nameCode" show-overflow-tooltip width="160"></el-table-column>
+        <el-table-column label="产品标识" prop="nameCode" show-overflow-tooltip width="160"></el-table-column>
         <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip width="160"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="160"></el-table-column>
         <el-table-column label="所属取货架编号" prop="freightCode" show-overflow-tooltip width="160"></el-table-column>
@@ -57,14 +136,22 @@
         <el-table-column label="分配条件1" prop="assignmentTerms1" show-overflow-tooltip width="160"></el-table-column>
         <el-table-column label="分配条件2" prop="assignmentTerms2" show-overflow-tooltip width="160"></el-table-column>
         <el-table-column label="备注" prop="remark" show-overflow-tooltip width="160"></el-table-column>
-        <el-table-column label="操作" fixed="right" >
+        <el-table-column label="操作" fixed="right" width="140">
           <template slot-scope="scope">
             <el-button
               type="text"
               size="small"
               @click.native.stop="removeRelId(scope.row)"
+              :disabled="!scope.row.nameCode"
             >解除绑定
             </el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="removeRelId(scope.row)"
+              :disabled="scope.row.nameCode"
+            >绑定产品
+            </el-button>
           </template>
         </el-table-column>
 
@@ -150,6 +237,7 @@
           <el-button type="primary" @click="submitAddBindData">提交</el-button>
         </div>
 
+
       </el-form>
     </el-dialog>
   </div>
@@ -165,6 +253,7 @@ import {
   bind,
   removeProduct
 } from '@/api/basic/workPlace/SysWorkplaceQueue'
+import { executeFuc, getHead } from '@/utils/customConfig'
 
 const formJson = {
   site_id: "",
@@ -177,7 +266,22 @@ export default {
   name: "workplaceQueue",
   data() {
     return {
-      showSearch: true,
+      //页面配置
+      executeFuc(row, type, clickFuc, value) {
+        return executeFuc(this, row, type, clickFuc, value);
+      },
+      executeEval(row, expression, defaultRet) {
+        if (expression) {
+          return eval(expression);
+        }
+        return defaultRet;
+      },
+      tableObj: [],
+      queryList: [],
+      tableHeader: [],
+      fromList: [],
+
+      showSearch: false,
       invList: [],
       list: [],
       total: 0,
@@ -264,7 +368,8 @@ export default {
         ylqxzcrbarmc: null,
         zczbhhzbapzbh: null,
         page: 1,
-        limit: 20
+        limit: 20,
+        keyWords:""
       },
       codeTotal: 0,
       codeDetailLoading: false,
@@ -500,8 +605,20 @@ export default {
     onCodeReset() {
       this.codeQuery = {
         orderIdFk: null,
+        scanCode: null,
+        code: null,
+        orderId: null,
+        status: null,
+        invCode: null,
+        nameCode: null,
+        cpmctymc: null,
+        ggxh: null,
+        batchNo: null,
+        ylqxzcrbarmc: null,
+        zczbhhzbapzbh: null,
         page: 1,
-        limit: 20
+        limit: 20,
+        keyWords:""
       };
       this.getCodeDetailList();
     },
@@ -606,6 +723,13 @@ export default {
     };
   },
   created() {
+    getHead("workplaceQueue-cwgl", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
     this.getCodeDetailList();
   },
 };
@@ -618,4 +742,5 @@ export default {
 .el-radio:focus:not(.is-focus):not(:active):not(.is-disabled) .el-radio__inner {
   box-shadow: none !important;
 }
+
 </style>