关联关系界面修改

8 months ago · c8044a70bf
parent ed41dd564d
commit c8044a70bf
2 changed files with 884 additions and 877 deletions
--- a/src/views/collect/relCode/operateRelCode.vue
+++ b/src/views/collect/relCode/operateRelCode.vue
@ -7,12 +7,18 @@
      @submit.native.prevent
      label-width="110px"
    >
+
+
      <el-card>
+
+
        <el-row style="margin-top: 5px; display: flex; align-items: center;">
          <div style="flex: 1;font-size: 24px">
            <span v-if="parentCode"><strong>{{ relFormData.packUnit }}</strong></span>
            <span v-if="parentCode" style="margin-left: 30px"><strong>{{ relFormData.packLayer }}层级</strong></span>
-              <span v-if="parentCode" style="margin-left: 30px"><strong>{{ parentCode || '暂未录入'}}</strong> <strong>  (<span style="color: #FF0000;">{{ syxjsl || 0}}</span>/<span >{{ bhxjsl || 0}}</span>)</strong></span>
+            <span v-if="parentCode"
+                  style="margin-left: 30px"><strong>{{ parentCode || '暂未录入' }}</strong> <strong>  (<span
+              style="color: #FF0000;">{{ syxjsl || 0 }}</span>/<span>{{ bhxjsl || 0 }}</span>)</strong></span>
          </div>
          <div style="margin-left: auto;">
            <el-button size="mini" type="primary" @click.native="giveUp()" :loading="submitLoading"
@ -27,8 +33,61 @@

        </el-row>

-          <el-row style="margin-top: 15px;font-size: 20px">
-            <el-descriptions :column="4" border label-style="width:75px"  style="margin-top: 15px;font-size: 20px">
+
+        <el-row>
+          <el-col :span="18">
+            <el-form-item prop="code" label="扫码录入:">
+              <el-input
+                id="inputer"
+                @focus="getInputFocus($event)"
+                @keypress.enter.native="enterKey($event)"
+                ref="inputRef"
+                style="ime-mode: disabled"
+                type="tel"
+                :placeholder="this.parentCode ?'请点击输入框进行扫码设置或者扫码录入':'请先扫码选入产品'"
+                v-model="scanCode"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-button-group>
+              <el-button
+                type="primary"
+                size="mini"
+                @click.native.stop="enterKey()"
+                style="margin-left: 15px"
+              >添加
+              </el-button>
+            </el-button-group>
+          </el-col>
+        </el-row>
+        <el-alert
+          title="扫码结果:"
+          :type="scanResultType"
+          :closable="false"
+          :description="result">
+        </el-alert>
+        <el-alert
+          v-if="warnVisible"
+          title="警告信息:"
+          type="warning"
+          :closable="true"
+          :dangerouslyUseHTMLString="true"
+          :description="warnResult">
+        </el-alert>
+        <el-alert
+          v-if="errVisible"
+          title="错误信息:"
+          type="warning"
+          :closable="true"
+          :dangerouslyUseHTMLString="true"
+          :description="errResult">
+        </el-alert>
+
+        <el-divider></el-divider>
+
+        <el-row style="margin-top: 6px;font-size: 20px">
+          <el-descriptions :column="4" border label-style="width:75px" style="margin-top: 6px;font-size: 20px">
            <el-descriptions-item label="产品名称">{{ relFormData.cpmctymc }}</el-descriptions-item>
            <el-descriptions-item label="规格型号">{{ relFormData.packageSpec }}</el-descriptions-item>
            <el-descriptions-item label="产品编码">{{ relFormData.productCode }}</el-descriptions-item>
@ -93,57 +152,6 @@
            </el-form-item>
          </el-col>
        </el-row>
-          <el-divider></el-divider>
-          <el-row>
-            <el-col :span="18">
-              <el-form-item prop="code" label="扫码录入:">
-                <el-input
-                  id="inputer"
-                  @focus="getInputFocus($event)"
-                  @keypress.enter.native="enterKey($event)"
-                  ref="inputRef"
-                  style="ime-mode: disabled"
-                  type="tel"
-                  :placeholder="this.parentCode ?'请点击输入框进行扫码设置或者扫码录入':'请先扫码选入产品'"
-                  v-model="scanCode"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-button-group>
-                <el-button
-                  type="primary"
-                  size="mini"
-                  @click.native.stop="enterKey()"
-                  style="margin-left: 15px"
-                >添加
-                </el-button>
-              </el-button-group>
-            </el-col>
-          </el-row>
-
-          <el-alert
-            title="扫码结果:"
-            :type="scanResultType"
-            :closable="false"
-            :description="result">
-          </el-alert>
-          <el-alert
-            v-if="warnVisible"
-            title="警告信息:"
-            type="warning"
-            :closable="true"
-            :dangerouslyUseHTMLString="true"
-            :description="warnResult">
-          </el-alert>
-          <el-alert
-            v-if="errVisible"
-            title="错误信息:"
-            type="warning"
-            :closable="true"
-            :dangerouslyUseHTMLString="true"
-            :description="errResult">
-          </el-alert>
      </el-card>
    </el-form>
    <el-tabs type="border-card" style="margin: 15px">
@ -197,6 +205,7 @@
 import {addRelCode, scanCodeRelCode, deleteDetail, deleteAllDetail} from "@/api/collect/relCode";
 import sonRelCode from './sonRelCode.vue';
 import A from "@/plugins/KeyScaner";
+
 export default {
  name: "operateRelCode",
  props: {
--- a/src/views/collect/relCode/operateRelCodeSpell.vue
+++ b/src/views/collect/relCode/operateRelCodeSpell.vue
@ -28,9 +28,56 @@
                >提交
                </el-button>
              </div>
-
            </el-row>
-
+          <el-row>
+            <el-col :span="18">
+              <el-form-item prop="code" label="扫码录入:">
+                <el-input
+                  id="inputer"
+                  @focus="getInputFocus($event)"
+                  @keypress.enter.native="enterKey($event)"
+                  ref="inputRef"
+                  style="ime-mode: disabled"
+                  type="tel"
+                  :placeholder="this.parentCode ?'请点击输入框进行扫码设置或者扫码录入':'请先扫码选入产品'"
+                  v-model="scanCode"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-button-group>
+                <el-button
+                  type="primary"
+                  size="mini"
+                  @click.native.stop="enterKey()"
+                  style="margin-left: 15px"
+                >添加
+                </el-button>
+              </el-button-group>
+            </el-col>
+          </el-row>
+          <el-alert
+            title="扫码结果:"
+            :type="scanResultType"
+            :closable="false"
+            :description="result">
+          </el-alert>
+          <el-alert
+            v-if="warnVisible"
+            title="警告信息:"
+            type="warning"
+            :closable="true"
+            :dangerouslyUseHTMLString="true"
+            :description="warnResult">
+          </el-alert>
+          <el-alert
+            v-if="errVisible"
+            title="错误信息:"
+            type="warning"
+            :closable="true"
+            :dangerouslyUseHTMLString="true"
+            :description="errResult">
+          </el-alert>
            <el-row style="margin-top: 15px;font-size: 20px">
              <el-descriptions :column="4" border label-style="width:75px"  style="margin-top: 15px;font-size: 20px">
                <el-descriptions-item label="产品名称">{{ relFormData.cpmctymc }}</el-descriptions-item>
@ -98,56 +145,7 @@
              </el-col>
            </el-row>
          <el-divider></el-divider>
-          <el-row>
-            <el-col :span="18">
-              <el-form-item prop="code" label="扫码录入:">
-                <el-input
-                  id="inputer"
-                  @focus="getInputFocus($event)"
-                  @keypress.enter.native="enterKey($event)"
-                  ref="inputRef"
-                  style="ime-mode: disabled"
-                  type="tel"
-                  :placeholder="this.parentCode ?'请点击输入框进行扫码设置或者扫码录入':'请先扫码选入产品'"
-                  v-model="scanCode"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-button-group>
-                <el-button
-                  type="primary"
-                  size="mini"
-                  @click.native.stop="enterKey()"
-                  style="margin-left: 15px"
-                >添加
-                </el-button>
-              </el-button-group>
-            </el-col>
-          </el-row>

-          <el-alert
-            title="扫码结果:"
-            :type="scanResultType"
-            :closable="false"
-            :description="result">
-          </el-alert>
-          <el-alert
-            v-if="warnVisible"
-            title="警告信息:"
-            type="warning"
-            :closable="true"
-            :dangerouslyUseHTMLString="true"
-            :description="warnResult">
-          </el-alert>
-          <el-alert
-            v-if="errVisible"
-            title="错误信息:"
-            type="warning"
-            :closable="true"
-            :dangerouslyUseHTMLString="true"
-            :description="errResult">
-          </el-alert>
        </el-card>
      </el-form>
      <el-tabs type="border-card" style="margin: 15px">