合同\工单

base-vue/src/views/modules/contract/contract-add-or-update.vue

@@ -10,7 +10,7 @@
             <el-form-item label="合同类型" prop="contractType">
               <el-select v-model="dataForm.contractType" placeholder="合同类型" style="width: 100%;">
                 <el-option
-                  v-for="item in contractTypeOpt"
+                  v-for="item in dictData[0]"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value">
@@ -41,7 +41,7 @@
             <el-form-item label="客户" prop="clientId">
               <el-select v-model="dataForm.clientId" placeholder="客户" style="width: 100%;">
                 <el-option
-                  v-for="item in clientIdOpt"
+                  v-for="item in dictData[1]"
                   :key="item.clientId"
                   :label="item.clientName"
                   :value="item.clientId">
@@ -153,6 +153,24 @@
                 <el-input size="mini" v-model="scope.row.quantity" placeholder="请输入数量" @input="calculateTotal(scope.$index)" @blur="calculateTotal(scope.$index)"></el-input>
               </template>
             </el-table-column>
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="120"
+              label="单位">
+              <template slot-scope="scope">
+                <el-input size="mini" v-model="scope.row.unit" placeholder="请输入单位"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column
+              header-align="center"
+              align="center"
+              width="120"
+              label="备注">
+              <template slot-scope="scope">
+                <el-input size="mini" v-model="scope.row.remark" placeholder="请输入备注"></el-input>
+              </template>
+            </el-table-column>
             <el-table-column
               header-align="center"
               align="center"
@@ -298,8 +316,7 @@
       }
     },
     props: {
-      contractTypeOpt: Array,
-      clientIdOpt: Array
+      dictData: Array
     },
     watch: {
       materData: {
@@ -323,14 +340,14 @@
               params: this.$http.adornParams()
             }).then(({data}) => {
               if (data && data.code === 0) {
-                this.dataForm.contractType = data.contract.contractType
+                this.dataForm.contractType = String(data.contract.contractType)
                 this.dataForm.isMaster = data.contract.isMaster
                 this.dataForm.contractNumber = data.contract.contractNumber
                 this.dataForm.clientId = data.contract.clientId
                 this.dataForm.materialJson = data.contract.materialJson
                 this.dataForm.isAcceptance = data.contract.isAcceptance
                 this.dataForm.remarks = data.contract.remarks
-                this.materData = JSON.parse(data.contract.materialJson)
+                this.materData = JSON.parse(data.contract.materialJson).material
               }
             })
             this.getFile()
@@ -376,7 +393,7 @@
                 'isMaster': this.dataForm.isMaster,
                 'contractNumber': this.dataForm.contractNumber,
                 'clientId': this.dataForm.clientId,
-                'materialJson': JSON.stringify(this.materData),
+                'materialJson': JSON.stringify({material: this.materData, total: this.dataForm.totalSum}),
                 'isAcceptance': this.dataForm.isAcceptance,
                 'remarks': this.dataForm.remarks,
                 'storageId': `${ids}${this.dataForm.storageId}`
@@ -389,6 +406,7 @@
                   duration: 1500,
                   onClose: () => {
                     this.$refs.upload.clearFiles()
+                    this.activeName = 'first'
                     this.visible = false
                     this.$emit('refreshDataList')
                   }