Selaa lähdekoodia

1、合同评审:附件非必填
2、出入库:新增图号等字段

liqianyi 11 kuukautta sitten
vanhempi
commit
75d7d867e5

+ 1 - 4
src/views/modules/cus/contract-add-or-update.vue

@@ -184,7 +184,7 @@
 <!--          <upload-component :display="true" :title="'沟通信息表附件'" :accept="'*'" :file-obj-list="fileList1"/>-->
 <!--        </el-row>-->
         <el-row class="my-row">
-          <upload-component :display="display" :title="'合同评审表'" :accept="'*'" :file-obj-list="fileList" @uploadSuccess="uploadSuccess" templateCode="contract_review_htpsyjb"/>
+          <upload-component :display-star="false" :display="display" :title="'合同评审表'" :accept="'*'" :file-obj-list="fileList" @uploadSuccess="uploadSuccess" templateCode="contract_review_htpsyjb"/>
         </el-row>
         <div style="margin-top: 20px" v-if="isCommVisible">
           <h3>合同沟通信息:</h3>
@@ -327,9 +327,6 @@ export default {
                   url: fList[i].url
                 })
               }
-            } else {
-              this.$message.error('请上传文件')
-              return
             }
             this.$http({
               url: this.$http.adornUrl(`/biz-service/flow/cusContractReview/submit`),

+ 17 - 1
src/views/modules/warehouse/stock-order-detail.vue

@@ -77,7 +77,23 @@
                 align="center"
                 width="140"
                 :show-tooltip-when-overflow="true"
-                label="批次号">
+                label="炉(批)号">
+              </el-table-column>
+              <el-table-column
+                prop="mapNumber"
+                header-align="center"
+                align="center"
+                width="140"
+                :show-tooltip-when-overflow="true"
+                label="图号">
+              </el-table-column>
+              <el-table-column
+                prop="materials"
+                header-align="center"
+                align="center"
+                width="140"
+                :show-tooltip-when-overflow="true"
+                label="材料牌号">
               </el-table-column>
               <el-table-column
                 prop="price"

+ 19 - 12
src/views/modules/warehouse/stock-order-inbound.vue

@@ -57,19 +57,26 @@
               </el-col>
             </el-row>
             <el-row class="my-row">
-<!--              <el-col :span="8">-->
-<!--                <el-form-item label="单位" prop="unitName" :rules="{required: false, message: '单位不能为空', trigger: 'blur'}">-->
-<!--                  <el-input v-model="item.unitName" :disabled="display || !item.buttonType || item.buttonType === '0'" placeholder="单位"></el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
-<!--              <el-col :span="8" style="padding-left: 20px">-->
-<!--                <el-form-item label="规格" prop="specifications" :rules="{required: false, message: '规格不能为空', trigger: 'blur'}">-->
-<!--                  <el-input v-model="item.specifications" :disabled="display || !item.buttonType || item.buttonType === '0'" placeholder="规格"></el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
               <el-col :span="8" style="padding-left: 20px">
-                <el-form-item label="批次号" prop="batchNumber" :rules="{required: false, message: '批次号不能为空', trigger: 'blur'}">
-                  <el-input v-model="item.batchNumber" :disabled="display" placeholder="请填写入库物品(零件)批次"></el-input>
+                <el-form-item label="炉(批)号" prop="batchNumber" :rules="{required: false, message: '炉(批)号不能为空', trigger: 'blur'}">
+                  <el-input v-model="item.batchNumber" :disabled="display" placeholder="请填写炉(批)号"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="图号" prop="mapNumber" :rules="{required: false, message: '图号不能为空', trigger: 'blur'}">
+                  <el-input v-model="item.mapNumber" :disabled="display" placeholder="图号"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="规格" prop="specifications" :rules="{required: false, message: '规格不能为空', trigger: 'blur'}">
+                  <el-input v-model="item.specifications" :disabled="display" placeholder="规格"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row class="my-row">
+              <el-col :span="8" style="padding-left: 20px">
+                <el-form-item label="材料牌号" prop="materials" :rules="{required: false, message: '材料牌号不能为空', trigger: 'blur'}">
+                  <el-input v-model="item.materials" :disabled="display" placeholder="材料牌号"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>