add

src/views/ledgerAssets/equipment/edit.vue

@@ -159,133 +159,6 @@
               {{ basicInfo.name }}
             </el-descriptions-item>
           </el-descriptions>
-          <div class="basic-details-title border-none">
-            <span class="border-span">仓储配置</span>
-          </div>
-          <el-descriptions title="" :column="4" size="medium" border>
-            <el-descriptions-item>
-              <template slot="label"> 启用库存预警</template>
-              {{ dictType[categoryWms.isWarn] }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">允许拆包</template>
-              {{ dictType[categoryWms.isUnpack] }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">安全库存</template>
-              {{ categoryWms.secureInventory }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">最小库存</template>
-              {{ categoryWms.minInventory }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label"> 最大库存</template>
-              {{ categoryWms.maxInventory }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">盘点模式</template>
-              {{ dictPd[categoryWms.inventoryMode] }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">质保预警参考</template>
-              <!-- <DictSelection
-                dictName="质保预警参考"
-                clearable
-                v-model="categoryWms.warrantyWarnRefer"
-              >
-              </DictSelection> -->
-              {{ categoryWms.warrantyWarnRefer }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">保质期</template>
-              {{
-                categoryWms.warrantyPeriod
-                  ? categoryWms.warrantyPeriod + '/'
-                  : null
-              }}{{ categoryWms.warrantyPeriodUnit }}
-            </el-descriptions-item>
-          </el-descriptions>
-
-          <div class="basic-details-title border-none">
-            <span class="border-span">生产信息</span>
-          </div>
-          <el-descriptions title="" :column="4" size="medium" border>
-            <el-descriptions-item>
-              <template slot="label"> 是否齐套件</template>
-              {{ dictType[categoryMes.isCompleteSet] }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">消耗波动</template>
-              {{ categoryMes.consumWave ? categoryMes.consumWave + '%' : null }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">变动损耗率</template>
-              {{
-                categoryMes.changeLossRate
-                  ? categoryMes.changeLossRate + '%'
-                  : null
-              }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">固定损耗数</template>
-              {{ categoryMes.fixLossNum }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">排程类型</template>
-              {{ categoryMes.apsType }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">允许改型</template>
-              {{ dictType[categoryMes.isModify] }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">允许返工返修</template>
-              {{ dictType[categoryMes.isRework] }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">是否返回料</template>
-              {{ dictType[categoryMes.isRematerial] }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">是否副产品</template>
-              {{ dictType[categoryMes.isByProduct] }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">是否废品</template>
-              {{ dictType[categoryMes.isWaste] }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">是否不良品</template>
-              {{ dictType[categoryMes.isDefective] }}
-            </el-descriptions-item>
-          </el-descriptions>
-
-          <div class="basic-details-title border-none">
-            <span class="border-span">生产信息</span>
-          </div>
-          <el-descriptions title="" :column="4" size="medium" border>
-            <el-descriptions-item>
-              <template slot="label">附件信息</template>
-              {{ categoryObj.fileName }}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">备注信息</template>
-              {{ categoryObj.remark }}
-            </el-descriptions-item>
-          </el-descriptions>
-
-          <div class="basic-details-title border-none">
-            <span class="border-span">关联信息</span>
-          </div>
-
-          <linkMsg
-            v-if="isLink"
-            ref="linkMsgRef"
-            :id="categoryObj.id"
-            :categoryLevelId="categoryObj.categoryLevelId"
-            :categoryLevelGroupId="categoryObj.categoryLevelGroupId"
-          />
 
           <div class="basic-details-title border-none">
             <span class="border-span">资产信息</span>
@@ -539,6 +412,135 @@
               </el-row>
             </el-col>
           </el-row>
+
+          <div class="basic-details-title border-none">
+            <span class="border-span">仓储配置</span>
+          </div>
+          <el-descriptions title="" :column="4" size="medium" border>
+            <el-descriptions-item>
+              <template slot="label"> 启用库存预警</template>
+              {{ dictType[categoryWms.isWarn] }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">允许拆包</template>
+              {{ dictType[categoryWms.isUnpack] }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">安全库存</template>
+              {{ categoryWms.secureInventory }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">最小库存</template>
+              {{ categoryWms.minInventory }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 最大库存</template>
+              {{ categoryWms.maxInventory }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">盘点模式</template>
+              {{ dictPd[categoryWms.inventoryMode] }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">质保预警参考</template>
+              <!-- <DictSelection
+                dictName="质保预警参考"
+                clearable
+                v-model="categoryWms.warrantyWarnRefer"
+              >
+              </DictSelection> -->
+              {{ categoryWms.warrantyWarnRefer }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">保质期</template>
+              {{
+                categoryWms.warrantyPeriod
+                  ? categoryWms.warrantyPeriod + '/'
+                  : null
+              }}{{ categoryWms.warrantyPeriodUnit }}
+            </el-descriptions-item>
+          </el-descriptions>
+
+          <div class="basic-details-title border-none">
+            <span class="border-span">生产信息</span>
+          </div>
+          <el-descriptions title="" :column="4" size="medium" border>
+            <el-descriptions-item>
+              <template slot="label"> 是否齐套件</template>
+              {{ dictType[categoryMes.isCompleteSet] }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">消耗波动</template>
+              {{ categoryMes.consumWave ? categoryMes.consumWave + '%' : null }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">变动损耗率</template>
+              {{
+                categoryMes.changeLossRate
+                  ? categoryMes.changeLossRate + '%'
+                  : null
+              }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">固定损耗数</template>
+              {{ categoryMes.fixLossNum }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">排程类型</template>
+              {{ categoryMes.apsType }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">允许改型</template>
+              {{ dictType[categoryMes.isModify] }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">允许返工返修</template>
+              {{ dictType[categoryMes.isRework] }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">是否返回料</template>
+              {{ dictType[categoryMes.isRematerial] }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">是否副产品</template>
+              {{ dictType[categoryMes.isByProduct] }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">是否废品</template>
+              {{ dictType[categoryMes.isWaste] }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">是否不良品</template>
+              {{ dictType[categoryMes.isDefective] }}
+            </el-descriptions-item>
+          </el-descriptions>
+
+          <div class="basic-details-title border-none">
+            <span class="border-span">生产信息</span>
+          </div>
+          <el-descriptions title="" :column="4" size="medium" border>
+            <el-descriptions-item>
+              <template slot="label">附件信息</template>
+              {{ categoryObj.fileName }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">备注信息</template>
+              {{ categoryObj.remark }}
+            </el-descriptions-item>
+          </el-descriptions>
+
+          <div class="basic-details-title border-none">
+            <span class="border-span">关联信息</span>
+          </div>
+
+          <linkMsg
+            v-if="isLink"
+            ref="linkMsgRef"
+            :id="categoryObj.id"
+            :categoryLevelId="categoryObj.categoryLevelId"
+            :categoryLevelGroupId="categoryObj.categoryLevelGroupId"
+          />
+
           <div class="basic-details-title border-none">
             <span class="border-span">文档信息</span>
           </div>

src/views/ledgerAssets/mould/edit.vue

@@ -23,6 +23,49 @@
           <el-form label-width="100px">
             <basicInfoVue ref="basicInfoVueRef" />
 
+            <div class="basic-details-title border-none">
+              <span class="border-span">资产信息</span>
+            </div>
+            <el-row>
+              <el-col :md="6" :xs="6" :sm="6">
+                <el-form-item label="模具编码">
+                  <el-input size="small" v-model="info.mouldCode"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :md="6" :xs="6" :sm="6">
+                <el-form-item label="固资编码">
+                  <el-input size="small" v-model="info.fixCode"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :md="6" :xs="6" :sm="6">
+                <el-form-item label="编号">
+                  <el-input size="small" v-model="info.code1"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :md="6" :xs="6" :sm="6">
+                <el-form-item label="冲压次数">
+                  <el-input size="small" v-model="info.cycs"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :md="6" :xs="6" :sm="6">
+                <el-form-item
+                  label="权属部门"
+                  prop="ownershipGroupId"
+                  class="qsbm"
+                >
+                  <ele-tree-select
+                    clearable
+                    :data="treeData"
+                    v-model="info.ownershipGroupId"
+                    placeholder="请选择"
+                    default-expand-all
+                    labelKey="name"
+                    valueKey="id"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
             <div class="basic-details-title border-none">
               <span class="border-span">模具信息</span>
             </div>
@@ -67,49 +110,6 @@
               </el-descriptions-item>
             </el-descriptions>
 
-            <div class="basic-details-title border-none">
-              <span class="border-span">资产信息</span>
-            </div>
-            <el-row>
-              <el-col :md="6" :xs="6" :sm="6">
-                <el-form-item label="模具编码">
-                  <el-input size="small" v-model="info.mouldCode"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :md="6" :xs="6" :sm="6">
-                <el-form-item label="固资编码">
-                  <el-input size="small" v-model="info.fixCode"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :md="6" :xs="6" :sm="6">
-                <el-form-item label="编号">
-                  <el-input size="small" v-model="info.code1"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :md="6" :xs="6" :sm="6">
-                <el-form-item label="冲压次数">
-                  <el-input size="small" v-model="info.cycs"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :md="6" :xs="6" :sm="6">
-                <el-form-item
-                  label="权属部门"
-                  prop="ownershipGroupId"
-                  class="qsbm"
-                >
-                  <ele-tree-select
-                    clearable
-                    :data="treeData"
-                    v-model="info.ownershipGroupId"
-                    placeholder="请选择"
-                    default-expand-all
-                    labelKey="name"
-                    valueKey="id"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-
             <div class="basic-details-title border-none">
               <span class="border-span">仓储配置</span>
             </div>

vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
         // target: 'http://192.168.1.139:18086', // 粟
         // target: 'http://192.168.1.132:18086', // 徐1
         // target: 'http://192.168.1.134:18086', //徐2
-        target: 'http://124.71.21.222:50001',
+        target: 'http://192.168.1.132:18086',
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''