shhj调整

44624425 · 李苏 · 5d4e553d · 44624425 · 44624425 · 44624425
Commit 44624425 authored Oct 10, 2023 by 李苏 💬
21 changed files
--- a/src/views/analysis/query/edit.vue
+++ b/src/views/analysis/query/edit.vue
@@ -17,7 +17,6 @@
    data() {
      return {
        editColItemList: [
-
          {
            label: '编码',
            prop: 'code',

--- a/src/views/analysis/query/index.vue
+++ b/src/views/analysis/query/index.vue
 <template>
-  <BasePage :power="{
+  <BasePage
+   @tpDbClick='tpDbClick'
+   :power="{
    add: false,
    copy: false,
    delButton: false,
@@ -22,7 +24,7 @@
 </template>

 <script>
-  // import Edit from './edit.vue'
+  import Edit from './edit.vue'
  export default {
    data() {
      return {
@@ -206,13 +208,16 @@

    },
    methods: {
+      tpDbClick(){
+        console.log('tpDbClick')
+      }
      /* 示例*/
      // demo(basePage){

      // }
    },
    components: {
-      // Edit
+      Edit
    }

  }

--- a/src/views/baseData/thing/edit.vue
+++ b/src/views/baseData/thing/edit.vue
@@ -49,30 +49,35 @@
            prop: 'wpbm',
            span: 12,
            type: 'input',
+             required:true,
          },
          {
            label: '物品名称',
            prop: 'wpmc',
            span: 12,
            type: 'input',
+             required:true,
          },
          {
            label: '物品特征',
            prop: 'wptz',
            span: 24,
            type: 'input',
+             required:true,
          },
          {
            label: '物品持有人',
            prop: 'wpcyr',
            span: 12,
            type: 'input',
+             required:true,
          },
          {
            label: '物品数量',
            prop: 'count',
            span: 12,
            type: 'inputNumber',
+             required:true,
          },

        ]

--- a/src/views/call/return/edit.vue
+++ b/src/views/call/return/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -162,6 +162,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/call/thingCall/edit.vue
+++ b/src/views/call/thingCall/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -169,6 +169,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/handle/back/edit.vue
+++ b/src/views/handle/back/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -166,6 +166,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/handle/destroy/edit.vue
+++ b/src/views/handle/destroy/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input  @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -165,6 +165,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/handle/sale/edit.vue
+++ b/src/views/handle/sale/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -159,6 +159,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/handle/saveCancel/edit.vue
+++ b/src/views/handle/saveCancel/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -154,6 +154,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/handle/seizure/edit.vue
+++ b/src/views/handle/seizure/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -170,6 +170,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/handle/transfer/edit.vue
+++ b/src/views/handle/transfer/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -159,6 +159,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/handle/unseal/edit.vue
+++ b/src/views/handle/unseal/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -154,6 +154,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/warehousing/detain/bcdjzky.vue
+++ b/src/views/warehousing/detain/bcdjzky.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh'  placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -246,6 +246,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/warehousing/detain/edit.vue
+++ b/src/views/warehousing/detain/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input  @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -16,9 +16,9 @@
          </div>
        </div>
        <el-row class="editMain_right" :gutter="20" :app="this">
-          <EditColItem :required="item.required||false" :readonly="item.readonly?true:false "
-            v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label"
-            :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" />
+          <EditColItem  :required="item.required||false" :readonly="item.readonly?true:false"
+            v-for="(item,index) in editColItemListS " :value="item.value" :span="item.span" :label="item.label"
+            :prop='item.prop' :key="item.label" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" />
        </el-row>
      </div>

@@ -73,6 +73,222 @@
        })
      }
    },
+    computed:{
+      editColItemListS(){
+        this.$set(this.form,'ckid','')
+        if(this.form.dsfkbc==1){
+          this.$nextTick(()=>{
+            this.form.ckid=''
+          })
+          return [
+            {
+              label: '入库单号',
+              prop: 'rkdh',
+              span: 24,
+              type: 'input',
+            },
+            {
+              label: '入库日期',
+              prop: 'rkrq',
+              span: 24,
+              type: 'date',
+              value:new Date().getTime(),
+              required: true,
+            },
+            {
+              "label": "部门",
+              "prop": "bm",
+              "span": 24,
+              "type": "RelSelect",
+              "value": "",
+              "required": true,
+              "typeConfig": {
+                "src": "hjbm/query",
+                "match": {
+                  "value": "bmid",
+                  "label": "bmmc"
+                }
+              }
+            },
+            {
+              label: '扣押方式',
+              prop: 'rklx',
+              span: 24,
+              "type": "RelSelect",
+              "typeConfig": {
+                "match": {
+                  "value": "value",
+                  "label": "name"
+                },
+                optionsData: [
+                  {
+                    name: '行政扣押',
+                    value: 0
+                  },
+                  {
+                    name: '刑事扣押',
+                    value: 1
+                  }
+                ]
+              },
+              required: true,
+            },
+            {
+              label: '保存至第三方库',
+              prop: 'dsfkbc',
+              span: 24,
+              type: 'Rcheckbox',
+              typeConfig: {
+                true: '1',
+                false: '0'
+              }
+            },
+            {
+              label: '第三方仓库',
+              prop: 'ckid',
+              span: 24,
+              "type": "RelSelect",
+              "typeConfig": {
+                "src": "jcsj/u_ckwh/query",
+                "match": {
+                  "value": "id",
+                  "label": "ckmc"
+                },
+                params: {
+                  cklx: "SF"
+                }
+              },
+              required: true,
+            },
+            {
+              label: '第三方名称',
+              prop: 'dsfmc',
+              span: 24,
+              type: 'input',
+               required: true,
+            },
+            {
+              label: '第三方地点',
+              prop: 'dsfkdd',
+              span: 24,
+              type: 'input',
+               required: true,
+
+            },
+            {
+              label: '扣押时间至',
+              prop: 'rkjzrq',
+              span: 24,
+              type: 'date',
+              required: true,
+            },
+            {
+              label: '经手人',
+              prop: 'jsr',
+              span: 24,
+              type: 'input',
+               required: true,
+            }
+          ]
+        }else{
+          return [
+            {
+              label: '入库单号',
+              prop: 'rkdh',
+              span: 24,
+              type: 'input',
+            },
+            {
+              label: '入库日期',
+              prop: 'rkrq',
+              span: 24,
+              type: 'date',
+              value:new Date().getTime(),
+              required: true,
+            },
+            {
+              "label": "部门",
+              "prop": "bm",
+              "span": 24,
+              "type": "RelSelect",
+              "value": "",
+              "required": true,
+              "typeConfig": {
+                "src": "hjbm/query",
+                "match": {
+                  "value": "bmid",
+                  "label": "bmmc"
+                }
+              }
+            },
+            {
+              label: '扣押方式',
+              prop: 'rklx',
+              span: 24,
+              "type": "RelSelect",
+              "typeConfig": {
+                "match": {
+                  "value": "value",
+                  "label": "name"
+                },
+                optionsData: [
+                  {
+                    name: '行政扣押',
+                    value: 0
+                  },
+                  {
+                    name: '刑事扣押',
+                    value: 1
+                  }
+                ]
+              },
+              required: true,
+            },
+            {
+              label: '保存至第三方库',
+              prop: 'dsfkbc',
+              span: 24,
+              type: 'Rcheckbox',
+              typeConfig: {
+                true: '1',
+                false: '0'
+              }
+            },
+            {
+              label: '仓库',
+              prop: 'ckid',
+              span: 24,
+              "type": "RelSelect",
+              "typeConfig": {
+                "src": "jcsj/u_ckwh/query",
+                "match": {
+                  "value": "id",
+                  "label": "ckmc"
+                },
+                params: {
+                  cklx: "KY"
+                }
+              },
+              required: true,
+            },
+            {
+              label: '扣押时间至',
+              prop: 'rkjzrq',
+              span: 24,
+              type: 'date',
+              required: true,
+            },
+            {
+              label: '经手人',
+              prop: 'jsr',
+              span: 24,
+              type: 'input',
+               required: true,
+            }
+          ]
+        }
+      }
+    },
    data() {
      return {
        xlh:'',
@@ -166,12 +382,14 @@
            prop: 'dsfmc',
            span: 24,
            type: 'input',
+             required: true,
          },
          {
            label: '第三方地点',
            prop: 'dsfkdd',
            span: 24,
            type: 'input',
+             required: true,

          },
          {
@@ -186,6 +404,7 @@
            prop: 'jsr',
            span: 24,
            type: 'input',
+             required: true,
          }

        ],
@@ -207,6 +426,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/warehousing/detain/jfzky.vue
+++ b/src/views/warehousing/detain/jfzky.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -246,6 +246,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/warehousing/extension/edit.vue
+++ b/src/views/warehousing/extension/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -207,6 +207,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/warehousing/freeze/edit.vue
+++ b/src/views/warehousing/freeze/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -155,6 +155,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/warehousing/registration/edit.vue
+++ b/src/views/warehousing/registration/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -155,6 +155,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/warehousing/registration/kyzdjbc.vue
+++ b/src/views/warehousing/registration/kyzdjbc.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -196,6 +196,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/warehousing/save/edit.vue
+++ b/src/views/warehousing/save/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -155,6 +155,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",

--- a/src/views/warehousing/seal/edit.vue
+++ b/src/views/warehousing/seal/edit.vue
@@ -6,7 +6,7 @@
        <div class="editMain_left">
          <!-- 扫码-->
          <div class="editMain_left1">
-            <el-input placeholder="请输入序列号" v-model="xlh" class="input-with-select">
+            <el-input @keydown.enter.native='cxxlh' placeholder="请输入序列号" v-model="xlh" class="input-with-select">
              <el-button @click="cxxlh" slot="append" icon="el-icon-search"></el-button>
            </el-input>
          </div>
@@ -155,6 +155,12 @@
            width: 120,
            align: "center"
          },
+          {
+            title: "序列号",
+            field: "xlh",
+            width: 100,
+            align: "center"
+          },
          {
            title: "物品特征",
            field: "wptz",