huang_an пре 2 година
родитељ
комит
88282d1257

+ 33 - 21
src/views/ledgerAssets/mould/edit.vue

@@ -26,33 +26,40 @@
             <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-descriptions
+              title=""
+              :column="4"
+              size="medium"
+              border
+              style="edit"
+            >
+              <el-descriptions-item>
+                <template slot="label"> 模具编码 </template>
+                <el-form-item label-width="0">
                   <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-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 固资编码 </template>
+                <el-form-item label-width="0">
                   <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-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 编号 </template>
+                <el-form-item label-width="0">
                   <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-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 冲压次数 </template>
+                <el-form-item label-width="0">
                   <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"
-                >
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 权属部门 </template>
+                <el-form-item label-width="0">
                   <ele-tree-select
                     clearable
                     :data="treeData"
@@ -63,8 +70,8 @@
                     valueKey="id"
                   />
                 </el-form-item>
-              </el-col>
-            </el-row>
+              </el-descriptions-item>
+            </el-descriptions>
 
             <div class="basic-details-title border-none">
               <span class="border-span">模具信息</span>
@@ -757,4 +764,9 @@
       width: 100%;
     }
   }
+  ::v-deep .el-descriptions {
+    .el-form-item {
+      margin-bottom: 0px;
+    }
+  }
 </style>

+ 26 - 16
src/views/ledgerAssets/sparepart/edit.vue

@@ -26,24 +26,28 @@
             <div class="basic-details-title border-none">
               <span class="border-span">资产信息</span>
             </div>
-            <el-row>
-              <el-col :md="8" :xs="8" :sm="8">
-                <el-form-item label="固资编码">
+            <el-descriptions
+              title=""
+              :column="4"
+              size="medium"
+              border
+              style="edit"
+            >
+              <el-descriptions-item>
+                <template slot="label"> 固资编码 </template>
+                <el-form-item label-width="0">
                   <el-input size="small" v-model="info.fixCode"></el-input>
                 </el-form-item>
-              </el-col>
-              <el-col :md="8" :xs="8" :sm="8">
-                <el-form-item label="编号">
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 编号 </template>
+                <el-form-item label-width="0">
                   <el-input size="small" v-model="info.code1"></el-input>
                 </el-form-item>
-              </el-col>
-              <el-col :md="8" :xs="8" :sm="8">
-                <!-- :initStr="info.ownershipDeptCode" -->
-                <el-form-item
-                  label="权属部门"
-                  prop="ownershipGroupId"
-                  class="qsbm"
-                >
+              </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label"> 权属部门 </template>
+                <el-form-item label-width="0">
                   <ele-tree-select
                     clearable
                     :data="treeData"
@@ -54,8 +58,9 @@
                     valueKey="id"
                   />
                 </el-form-item>
-              </el-col>
-            </el-row>
+              </el-descriptions-item>
+            </el-descriptions>
+
             <div class="baseinfo-container">
               <warehouseConfigVue ref="warehouseConfigRef" />
               <productInfoVue ref="productInfoRef" />
@@ -453,4 +458,9 @@
       width: 100%;
     }
   }
+  ::v-deep .el-descriptions {
+    .el-form-item {
+      margin-bottom: 0px;
+    }
+  }
 </style>

+ 29 - 25
src/views/ledgerAssets/turnoverCar/edit.vue

@@ -28,29 +28,28 @@
             </div>
 
             <el-form label-width="90px">
-              <el-row>
-                <el-col :md="8" :xs="8" :sm="8">
-                  <el-form-item label="固资编码" prop="fixCode">
-                    <el-input
-                      v-model="info.fixCode"
-                      type="text"
-                      size="small"
-                      placeholder="请输入"
-                    ></el-input
-                  ></el-form-item>
-                </el-col>
-                <el-col :md="8" :xs="8" :sm="8">
-                  <el-form-item label="编号" prop="code1">
-                    <el-input
-                      v-model="info.code1"
-                      type="text"
-                      size="small"
-                      placeholder="请输入"
-                    ></el-input
-                  ></el-form-item>
-                </el-col>
-                <el-col :md="8" :xs="8" :sm="8">
-                  <el-form-item label="权属部门" prop="name" class="qsbm">
+              <el-descriptions
+                title=""
+                :column="4"
+                size="medium"
+                border
+                style="edit"
+              >
+                <el-descriptions-item>
+                  <template slot="label"> 固资编码 </template>
+                  <el-form-item label-width="0">
+                    <el-input class="input" v-model="info.fixCode"></el-input>
+                  </el-form-item>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 编号 </template>
+                  <el-form-item label-width="0">
+                    <el-input class="input" v-model="info.code1"></el-input>
+                  </el-form-item>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"> 权属部门 </template>
+                  <el-form-item label-width="0">
                     <ele-tree-select
                       clearable
                       :data="treeData"
@@ -61,8 +60,8 @@
                       valueKey="id"
                     />
                   </el-form-item>
-                </el-col>
-              </el-row>
+                </el-descriptions-item>
+              </el-descriptions>
             </el-form>
 
             <div class="basic-details-title border-none">
@@ -408,4 +407,9 @@
       width: 100%;
     }
   }
+  ::v-deep .el-descriptions {
+    .el-form-item {
+      margin-bottom: 0px;
+    }
+  }
 </style>

+ 2 - 2
vue.config.js

@@ -32,8 +32,8 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://192.168.3.51:18086', // 测试环境
-        // target: 'http://124.71.68.31:50001',
-        target: 'http://192.168.1.139:18086', // 粟
+        target: 'http://124.71.68.31:50001',
+        // target: 'http://192.168.1.139:18086', // 粟
         // target: 'http://192.168.1.132:18086', // 徐
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {