基础调整1

src/views/ccgl/jcsj/hz/index.vue

@@ -59,15 +59,8 @@
           ],
           queryParams: [
             [{
-                label: '编码',
-                prop: 'code',
-                span: 6,
-                type: 'input',
-                value: ''
-              },
-              {
-                label: '名称',
-                prop: 'name',
+                label: '货主信息',
+                prop: 'hzInfo',
                 span: 6,
                 type: 'input',
                 value: ''

src/views/ccgl/zlgl/jyd/mx.vue

@@ -50,6 +50,12 @@
                 field: "wlxxGg",
                 width: 140
               },
+              {
+                title: "检验数量",
+                field: "jysl",
+                width: 140
+
+              },
               {
                 title: "制令号",
                 field: "zlh",
@@ -74,7 +80,7 @@
               title: "合格标志",
               field: "hgbz",
               "transform": {
-                "url": "lxyl/zlgl/ukcjyd/init/JyStatus",
+                "url": "lxyl/zlgl/ukcjyd/init/zjqdStatusEnum",
                 "label": "name",
                 "value": "id"
               },

src/views/ccgl/zlgl/jyd/top/add.vue

@@ -53,7 +53,18 @@
           /* 基本配置*/
           url: 'lxyl/zlgl/ukcjyd',
           queryUrl:'wms/common/queryZkPackOrRq',
-          tableTitle: [{
+          tableTitle: [
+            {
+              title: "唯一码",
+              field: "packCode",
+              width: 140
+            },
+            {
+              title: "容器",
+              field: "rqCode",
+              width: 140
+            },
+            {
               title: "物料编码",
               field: "wlxxCode",
               width: 140
@@ -83,11 +94,7 @@
               field: "hzName",
               width: 140
             },
-            {
-              title: "唯一码",
-              field: "packCode",
-              width: 140
-            },
+          
             {
               title: "数量",
               field: "packmxSl",

src/views/ccgl/zlgl/jyd/top/index.vue

@@ -2,10 +2,10 @@
   <BasePage :power='power' @getRow='getRow' class="min_full" style="height: 100%;" :config="config">
     <template #dialog="ctx">
       <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
-      <Add  :app='ctx.basePage'  v-if="ctx.basePage.showDialog"  />
+      <Add :app='ctx.basePage' v-if="ctx.basePage.showDialog" />
     </template>
     <template #toolbar="ctx">
-        <el-button @click="showAdd(ctx.basePage)" size='mini' type="primary">新增</el-button>
+      <el-button @click="showAdd(ctx.basePage)" size='mini' type="primary">新增</el-button>
       <el-button @click="pd(ctx.basePage,'A')" size='mini' type="primary">判定合格</el-button>
       <el-button @click="pd(ctx.basePage,'R')" size='mini' type="primary">判定不合格</el-button>
 
@@ -20,7 +20,7 @@
   export default {
     data() {
       return {
-        power:{
+        power: {
           add: false,
           copy: false,
           /* 手动控制删除 */
@@ -85,25 +85,35 @@
               title: "来源单类型",
               field: "lydlx",
               width: 200,
-               "transform": {
-                  "url": "lxyl/zlgl/ukcjyd/init/Jylydlx",
-                  "label": "name",
-                  "value": "id"
-                }
+              "transform": {
+                "url": "lxyl/zlgl/ukcjyd/init/Jylydlx",
+                "label": "name",
+                "value": "id"
+              }
             },
             {
               title: "来源单号",
               field: "lydid",
               width: 200,
-              formatter(a,b,c){
-                return a.kccjCode||a.ukcyhdCode
+              formatter(a, b, c) {
+                return a.kccjCode || a.ukcyhdCode
               }
             },
             {
-              title: "检验批数量",
+              title: "检验数量",
               field: "jypsl",
               width: 140
             },
+            {
+              title: "评估代码",
+              field: "pgdm",
+              "transform": {
+                "url": "lxyl/zlgl/ukcjyd/init/JyStatus",
+                "label": "name",
+                "value": "id"
+              },
+              width: 140
+            },
             // {
             //   title: "合格数量",
             //   field: "hgsl",
@@ -171,25 +181,25 @@
 
     },
     methods: {
-      pd(ctx,hgbz){
-        if(ctx.singleItem&&ctx.singleItem.id){
-          this.$post('lxyl/zlgl/ukcjyd/doCheck',{
-            id:ctx.singleItem.id,
-            hgbz:hgbz
-          }).then(res=>{
-            if(res.success){
+      pd(ctx, hgbz) {
+        if (ctx.singleItem && ctx.singleItem.id) {
+          this.$post('lxyl/zlgl/ukcjyd/doCheck', {
+            id: ctx.singleItem.id,
+            hgbz: hgbz
+          }).then(res => {
+            if (res.success) {
               this.$success('操作成功'),
-              ctx.refresh()
+                ctx.refresh()
             }
           })
-        }else{
+        } else {
           this.$warning('请选中一条数据')
         }
       },
-      showAdd(ctx){
-      ctx.DialogTitle='新增'
-      ctx.DialogWidth='70vw'
-      ctx.showDialog=true
+      showAdd(ctx) {
+        ctx.DialogTitle = '新增'
+        ctx.DialogWidth = '70vw'
+        ctx.showDialog = true
       },
       getRow(val) {
         this.$emit('getRow', val)

src/views/ccgl/zlgl/kccjd/mx.vue

@@ -100,11 +100,11 @@
             {
               title: "合格标志",
               field: "hgbz",
-              "transform": {
-                "url": "lxyl/zlgl/ukcjyd/init/JyStatus",
-                "label": "name",
-                "value": "id"
-              },
+             "transform": {
+               "url": "lxyl/zlgl/ukcjyd/init/zjqdStatusEnum",
+               "label": "name",
+               "value": "id"
+             },
               width: 140
             },
 

src/views/ccgl/zlgl/kccjd/top/add.vue

@@ -50,7 +50,18 @@
           /* 基本配置*/
           url: 'lxyl/zlgl/ukcjyd',
           queryUrl:'wms/common/queryZkPackOrRq',
-          tableTitle: [{
+          tableTitle: [
+            {
+              title: "唯一码",
+              field: "packCode",
+              width: 140
+            },
+            {
+              title: "容器",
+              field: "rqCode",
+              width: 140
+            },
+            {
               title: "物料编码",
               field: "wlxxCode",
               width: 140
@@ -80,11 +91,6 @@
               field: "hzName",
               width: 140
             },
-            {
-              title: "唯一码",
-              field: "packCode",
-              width: 140
-            },
             {
               title: "数量",
               field: "sl",

src/views/ccgl/zlgl/kcyhd/mx.vue

@@ -101,7 +101,7 @@
               title: "合格标志",
               field: "hgbz",
               "transform": {
-                "url": "lxyl/zlgl/ukcjyd/init/JyStatus",
+                "url": "lxyl/zlgl/ukcjyd/init/zjqdStatusEnum",
                 "label": "name",
                 "value": "id"
               },

src/views/ccgl/zlgl/kcyhd/top/add.vue

@@ -50,7 +50,18 @@
           /* 基本配置*/
           url: 'lxyl/zlgl/ukcjyd',
           queryUrl:'wms/common/queryZkPackOrRq',
-          tableTitle: [{
+          tableTitle: [
+            {
+              title: "唯一码",
+              field: "packCode",
+              width: 140
+            },
+            {
+              title: "容器",
+              field: "rqCode",
+              width: 140
+            },
+            {
               title: "物料编码",
               field: "wlxxCode",
               width: 140
@@ -80,11 +91,6 @@
               field: "hzName",
               width: 140
             },
-            {
-              title: "唯一码",
-              field: "packCode",
-              width: 140
-            },
             {
               title: "数量",
               field: "sl",