样式xiugai

src/views/material/asset.vue

@@ -77,9 +77,9 @@
                   stripe
                   height="calc(100vh - 180px)"
                   size="mini">
-          <el-table-column label="资产编号" prop="assetNumber" :show-overflow-tooltip="true"/>
+          <el-table-column label="唯一编码" prop="deptAssetNumber" :show-overflow-tooltip="true"/>
           <el-table-column label="物品名称" prop="assetName" min-width="100" :show-overflow-tooltip="true"/>
-          <el-table-column label="部门编号" prop="deptAssetNumber" :show-overflow-tooltip="true"/>
+          <el-table-column label="公司资产编号" prop="assetNumber" :show-overflow-tooltip="true"/>
           <el-table-column label="资产类型" width="80">
             <template slot-scope="scope">
               <el-tag v-if="scope.row.assetType==='1'" size="mini" type="warning">耗材</el-tag>
@@ -87,16 +87,17 @@
             </template>
           </el-table-column>
           <el-table-column label="设备型号" prop="equipmentType" :show-overflow-tooltip="true"/>
-          <el-table-column label="设备编号" prop="equipmentNumber" :show-overflow-tooltip="true"/>
-          <el-table-column label="原厂编号" prop="factoryNumber" :show-overflow-tooltip="true"/>
+<!--          <el-table-column label="设备编号" prop="equipmentNumber" :show-overflow-tooltip="true"/>-->
+<!--          <el-table-column label="原厂编号" prop="factoryNumber" :show-overflow-tooltip="true"/>-->
           <el-table-column label="生产厂家" prop="factoryName" :show-overflow-tooltip="true"/>
           <el-table-column label="购入日期" prop="buyDate"/>
           <el-table-column label="状态" width="90">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.status==='1'" type="success" size="mini">在库</el-tag>
-              <el-tag v-else-if="scope.row.status==='2'" size="mini">出库</el-tag>
-              <el-tag v-else-if="scope.row.status==='3'" size="mini" type="info">出库(不回库)</el-tag>
-              <el-tag v-else size="mini" type="warning">报失</el-tag>
+              <el-tag v-if="scope.row.status==='1'" type="success">在库</el-tag>
+              <el-tag v-else-if="scope.row.status==='2'">出库</el-tag>
+              <el-tag v-else-if="scope.row.status==='3'" type="info">出库(不回库)</el-tag>
+              <el-tag v-else-if="scope.row.status==='4'" type="warning">报失</el-tag>
+              <el-tag v-else type="danger">报失</el-tag>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="160">
@@ -159,11 +160,11 @@
             <el-form-item label="物品名称" prop="assetName">
               <el-input v-model="form.assetName" placeholder="请输入资产名称" maxlength="30"/>
             </el-form-item>
-            <el-form-item label="资产编号" prop="assetNumber">
-              <el-input v-model="form.assetNumber" placeholder="请输入资产编号" maxlength="30"/>
+            <el-form-item label="公司资产编号" prop="assetNumber">
+              <el-input v-model="form.assetNumber" placeholder="请输入公司资产编号" maxlength="30"/>
             </el-form-item>
-            <el-form-item label="部门编号" prop="deptAssetNumber">
-              <el-input v-model="form.deptAssetNumber" placeholder="请输入资产编号" disabled/>
+            <el-form-item label="唯一编码" prop="deptAssetNumber">
+              <el-input v-model="form.deptAssetNumber" disabled/>
             </el-form-item>
             <el-form-item label="资产类型" prop="assetType">
               <el-radio-group v-model="form.assetType">
@@ -177,18 +178,18 @@
             <el-form-item label="数量" prop="num" v-if="form.assetType==='1'">
               <el-input-number v-model="form.num"></el-input-number>
             </el-form-item>
-            <el-form-item label="设备设施名称" prop="equipmentName">
-              <el-input v-model="form.equipmentName" placeholder="请输入设备设施名称" maxlength="30"/>
-            </el-form-item>
+<!--            <el-form-item label="设备设施名称" prop="equipmentName">-->
+<!--              <el-input v-model="form.equipmentName" placeholder="请输入设备设施名称" maxlength="30"/>-->
+<!--            </el-form-item>-->
             <el-form-item label="设备型号" prop="equipmentType">
               <el-input v-model="form.equipmentType" placeholder="请输入设备型号" maxlength="30"/>
             </el-form-item>
-            <el-form-item label="设备编号" prop="equipmentNumber">
-              <el-input v-model="form.equipmentNumber" placeholder="请输入设备编号" maxlength="30"/>
-            </el-form-item>
-            <el-form-item label="原厂编号" prop="factoryNumber">
-              <el-input v-model="form.factoryNumber" placeholder="请输入原厂编号"></el-input>
-            </el-form-item>
+<!--            <el-form-item label="设备编号" prop="equipmentNumber">-->
+<!--              <el-input v-model="form.equipmentNumber" placeholder="请输入设备编号" maxlength="30"/>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="原厂编号" prop="factoryNumber">-->
+<!--              <el-input v-model="form.factoryNumber" placeholder="请输入原厂编号"></el-input>-->
+<!--            </el-form-item>-->
             <el-form-item label="生产厂家" prop="factoryName">
               <el-input v-model="form.factoryName" placeholder="请输入生产厂家"></el-input>
             </el-form-item>
@@ -271,10 +272,10 @@
             <el-form-item label="物品名称" prop="assetName">
               <div>{{ transferForm.assetName }}</div>
             </el-form-item>
-            <el-form-item label="资产编号" prop="assetNumber">
+            <el-form-item label="公司资产编号" prop="assetNumber">
               <div>{{ transferForm.assetNumber }}</div>
             </el-form-item>
-            <el-form-item label="部门编号" prop="deptAssetNumber">
+            <el-form-item label="唯一编码" prop="deptAssetNumber">
               <div>{{ transferForm.deptAssetNumber }}</div>
             </el-form-item>
             <el-form-item label="设备型号" prop="equipmentType">

src/views/material/components/assetDetail.vue

@@ -6,28 +6,28 @@
           <el-form-item label="物品名称" prop="assetName">
             <div>{{ form.assetName }}</div>
           </el-form-item>
-          <el-form-item label="资产编号" prop="assetNumber">
-            <div>{{ form.assetNumber }}</div>
-          </el-form-item>
-          <el-form-item label="部门编号" prop="deptAssetNumber">
+          <el-form-item label="唯一编码" prop="deptAssetNumber">
             <div>{{ form.deptAssetNumber }}</div>
           </el-form-item>
+          <el-form-item label="公司资产编号" prop="assetNumber">
+            <div>{{ form.assetNumber }}</div>
+          </el-form-item>
           <el-form-item label="资产类型" prop="assetType">
             <el-tag v-if="form.assetType===1" size="mini" type="warning">耗材</el-tag>
             <el-tag v-else size="mini" type="success">固定资产</el-tag>
           </el-form-item>
-          <el-form-item label="设备设施名称" prop="equipmentName">
-            <div>{{ form.equipmentName }}</div>
-          </el-form-item>
+<!--          <el-form-item label="设备设施名称" prop="equipmentName">-->
+<!--            <div>{{ form.equipmentName }}</div>-->
+<!--          </el-form-item>-->
           <el-form-item label="设备型号" prop="equipmentType">
             <div>{{ form.equipmentType }}</div>
           </el-form-item>
-          <el-form-item label="设备编号" prop="equipmentNumber">
-            <div>{{ form.equipmentNumber }}</div>
-          </el-form-item>
-          <el-form-item label="原厂编号" prop="factoryNumber">
-            <div>{{ form.factoryNumber }}</div>
-          </el-form-item>
+<!--          <el-form-item label="设备编号" prop="equipmentNumber">-->
+<!--            <div>{{ form.equipmentNumber }}</div>-->
+<!--          </el-form-item>-->
+<!--          <el-form-item label="原厂编号" prop="factoryNumber">-->
+<!--            <div>{{ form.factoryNumber }}</div>-->
+<!--          </el-form-item>-->
           <el-form-item label="生产厂家" prop="factoryName">
             <div>{{ form.factoryName }}</div>
           </el-form-item>

src/views/material/myReceive.vue

@@ -23,9 +23,9 @@
               row-key="id"
               :row-class-name="rowClassName"
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column label="资产编号" prop="assetNumber" :show-overflow-tooltip="true"/>
+      <el-table-column label="唯一编码" prop="deptAssetNumber" :show-overflow-tooltip="true"/>
+      <el-table-column label="公司资产编号" prop="assetNumber" :show-overflow-tooltip="true"/>
       <el-table-column label="物品名称" prop="assetName" min-width="100" :show-overflow-tooltip="true"/>
-      <el-table-column label="部门编号" prop="deptAssetNumber" :show-overflow-tooltip="true"/>
       <el-table-column label="资产类型" width="80">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.assetType==='1'" size="mini" type="warning">耗材</el-tag>
@@ -33,8 +33,8 @@
         </template>
       </el-table-column>
       <el-table-column label="设备型号" prop="equipmentType" :show-overflow-tooltip="true"/>
-      <el-table-column label="设备编号" prop="equipmentNumber" :show-overflow-tooltip="true"/>
-      <el-table-column label="原厂编号" prop="factoryNumber" :show-overflow-tooltip="true"/>
+<!--      <el-table-column label="设备编号" prop="equipmentNumber" :show-overflow-tooltip="true"/>-->
+<!--      <el-table-column label="原厂编号" prop="factoryNumber" :show-overflow-tooltip="true"/>-->
       <el-table-column label="生产厂家" prop="factoryName" :show-overflow-tooltip="true"/>
       <el-table-column label="领用日期" prop="receiveDate">
         <template slot-scope="scope">

src/views/task/task.vue

@@ -230,7 +230,7 @@
         </el-form-item>
         <el-form-item label="所属项目：">
           <span>{{ splitForm.projectName }}</span>
-          <el-button type="text" icon="el-icon-circle-plus-outline"
+          <el-button type="primary" plain circle icon="el-icon-plus"
                      style="float: right; padding: -1px 3px" @click="addChild"></el-button>
         </el-form-item>
         <div style="display: flex;justify-content: flex-start;flex-wrap:wrap">
@@ -238,8 +238,9 @@
             <div slot="header" class="clearfix">
               <div class="card-header">
                 <div style="margin-top: 5px">子任务{{ index + 1 }}</div>
-                <el-button type="text" icon="el-icon-delete" @click="delChild(index)"
-                           style="float: right;color: red; padding: 3px 0"></el-button>
+                <el-button type="danger" circle @click="delChild(index)" icon="el-icon-delete"
+                           style="float: right;">
+                </el-button>
               </div>
             </div>
             <el-form ref="splitChild" :model="child" :rules="rules" size="mini">