Просмотр исходного кода

feat(合同管理): 移除生产要求类型限制并添加至销售订单

liujt 8 месяцев назад
Родитель
Сommit
be2e67808c

+ 1 - 1
src/views/contractManage/contractBook/components/addDialog.vue

@@ -200,7 +200,7 @@
           <el-form-item prop="contractFile" label="合同附件">
             <fileMain v-model="form.fileId"></fileMain>
           </el-form-item>
-          <el-form-item v-if="form.type == 1" prop="productionRequirements" label="生产要求">
+          <el-form-item prop="productionRequirements" label="生产要求">
             <el-input
               clearable
               v-model="form.productionRequirements"

+ 1 - 1
src/views/contractManage/contractBook/components/detailDialog.vue

@@ -138,7 +138,7 @@
             <el-form-item prop="contractFile" label="合同附件:">
               <fileMain v-model="form.fileId" type="view"></fileMain>
             </el-form-item>
-            <el-form-item v-if="form.type == 1" prop="productionRequirements" label="生产要求:">
+            <el-form-item prop="productionRequirements" label="生产要求:">
               <el-input v-model="form.productionRequirements" disabled></el-input>
             </el-form-item>
           </el-col>

+ 10 - 1
src/views/saleManage/saleOrder/components/addDialog.vue

@@ -152,6 +152,13 @@
           <el-form-item prop="orderFiles" label="订单附件">
             <fileMain v-model="form.orderFiles"></fileMain>
           </el-form-item>
+          <el-form-item prop="productionRequirements" label="生产要求">
+            <el-input
+              clearable
+              v-model="form.productionRequirements"
+              placeholder="请输入"
+            />
+          </el-form-item>
         </el-col>
 
         <el-col :span="12">
@@ -635,6 +642,7 @@
         settlementModeName: '分期付款',
         partaUnifiedSocialCreditCode: '',
         partbUnifiedSocialCreditCode: '',
+        productionRequirements: '',
         partaAddress: '',
         partaEmail: '',
         partaFax: '',
@@ -1226,7 +1234,8 @@
         this.form = Object.assign({}, this.form, {
           contractId: obj.id,
           contractName: obj.contractName,
-          relationType:3
+          relationType:3,
+          productionRequirements:obj.productionRequirements,
         });
         this.getDetailData(obj.id);
         this.$store.commit('order/setContractId', obj.id);

+ 3 - 0
src/views/saleManage/saleOrder/components/darwerComponents/saleOrderInfo.vue

@@ -126,6 +126,9 @@
           <el-form-item prop="orderFiles" label="订单附件:">
             <fileMain v-model="form.orderFiles" type="view"></fileMain>
           </el-form-item>
+          <el-form-item prop="productionRequirements" label="生产要求:">
+            <el-input v-model="form.productionRequirements" disabled></el-input>
+          </el-form-item>
         </el-col>
       </el-row>
       <el-row>