소스 검색

前后:导出模板

dubch 4 년 전
부모
커밋
b8dd2e7fb2

+ 2 - 2
src/dashoo.cn/backend/api/conf/app.conf

@@ -63,8 +63,8 @@ callbackHost=http://localhost:10091/api
 # BaseUrl=http://localhost:8080/acti-api/api/acti
 
 contractUrl=http://weed1.labsop.cn:9390/4,03b0345ae913f9
-reviewGoodsUrl=http://weed1.labsop.cn:9390/6,03b06cfaec27ac
-reviewServiceUrl=http://weed1.labsop.cn:9390/4,03b0451e356a36
+reviewGoodsUrl=http://weed1.labsop.cn:9390/3,04bcc0d2f6bf6e
+reviewServiceUrl=http://weed1.labsop.cn:9390/5,04bcbf3657f007
 reviewBasisUrl=http://weed1.labsop.cn:9390/6,03b041cda73303
 contractSumScoreUrl=http://weed1.labsop.cn:9390/3,04b52a0cbe710e
 ServiceSumScoreUrl=http://weed1.labsop.cn:9390/1,036a3addb41d61

+ 17 - 0
src/dashoo.cn/backend/api/controllers/oilcontract/contractReview.go

@@ -400,6 +400,23 @@ func (this *OilContractReviewController) DocExport() {
 		fileName = "承包商日常业绩评价表模板.docx"
 		Url = utils.Cfg.MustValue("workflow", "reviewBasisUrl")
 	} else {
+		if contractModel.ClassName == "供用水电气热合同" {
+			datamap["OperType"] = "☑水电气热 □油田工程  □仓储保管\n□技术和知识产权  □运输   □服务\n□承揽     □租赁      □其他 "
+		} else if contractModel.ClassName == "仓储保管合同" {
+			datamap["OperType"] = "□水电气热 □油田工程  ☑仓储保管\n□技术和知识产权  □运输   □服务\n□承揽     □租赁      □其他 "
+		} else if contractModel.ClassName == "技术合同和知识产权合同" {
+			datamap["OperType"] = "□水电气热 □油田工程  □仓储保管\n☑技术和知识产权  □运输   □服务\n□承揽     □租赁      □其他 "
+		} else if contractModel.ClassName == "运输合同" {
+			datamap["OperType"] = "□水电气热 □油田工程  □仓储保管\n□技术和知识产权  ☑运输   □服务\n□承揽     □租赁      □其他 "
+		} else if contractModel.ClassName == "服务合同" {
+			datamap["OperType"] = "□水电气热 □油田工程  □仓储保管\n□技术和知识产权  □运输   ☑服务\n□承揽     □租赁      □其他 "
+		} else if contractModel.ClassName == "承揽合同" {
+			datamap["OperType"] = "□水电气热 □油田工程  □仓储保管\n□技术和知识产权  □运输   □服务\n☑承揽     □租赁      □其他 "
+		} else if contractModel.ClassName == "租赁合同" {
+			datamap["OperType"] = "□水电气热 □油田工程  □仓储保管\n□技术和知识产权  □运输   □服务\n□承揽     ☑租赁      □其他 "
+		} else {
+			datamap["OperType"] = "□水电气热 □油田工程  □仓储保管\n□技术和知识产权  □运输   □服务\n□承揽     □租赁      ☑其他 "
+		}
 		fileName = "服务商日常业绩评价表模板.docx"
 		Url = utils.Cfg.MustValue("workflow", "reviewServiceUrl")
 	}

BIN
src/dashoo.cn/doc/供应商日常业绩评价表模板.docx


BIN
src/dashoo.cn/doc/服务商日常业绩评价表模板.docx


+ 2 - 2
src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/index.vue

@@ -338,10 +338,10 @@
             </template>
           </el-table-column>
           <el-table-column  prop="ImportSupplierName"  min-width="250" label="企业名称" align="center" show-overflow-tooltip></el-table-column>
-          <el-table-column  prop="SupplierName"  width="220" label="确认企业名称" align="center" show-overflow-tooltip >
+          <el-table-column  prop="SupplierName"  width="250" label="确认企业名称" align="center" show-overflow-tooltip >
              <template slot-scope="scope">
                <el-form-item  style="margin-bottom: 0px;" :prop="'tableData.' + scope.$index + '.SupplierId'" :rules="rules.name">
-                 <el-select size="mini" v-model="scope.row.SupplierId" filterable :ref="'supplierIdSelect'+scope.$index" placeholder="请选择" :disabled="nameDisabled(scope.row.ContractClass)" @change="allUpdate(scope.row.SupplierId,scope.row.ImportSupplierName,'SupplierId',scope.row.Id, scope.row.SupplierId)">
+                 <el-select style="width: 100%" size="mini" v-model="scope.row.SupplierId" filterable :ref="'supplierIdSelect'+scope.$index" placeholder="请选择" :disabled="nameDisabled(scope.row.ContractClass)" @change="allUpdate(scope.row.SupplierId,scope.row.ImportSupplierName,'SupplierId',scope.row.Id, scope.row.SupplierId)">
                     <el-option v-for="(item,index) of (SupplierNameDataFun(scope.row.ImportSupplierName,scope.$index, scope.row.ContractClass))" :key="index" :label="item.SupplierName" :value="item.Id"></el-option>
                  </el-select>
                </el-form-item>